summaryrefslogtreecommitdiff
path: root/src/merge_driver.h
Commit message (Expand)AuthorAgeFilesLines
* Make sure to always include "common.h" firstPatrick Steinhardt2017-07-031-0/+2
* merge driver: remove `check` callbackEdward Thomson2016-03-171-4/+20
* merge driver: correct global initializationEdward Thomson2016-03-171-0/+44