summaryrefslogtreecommitdiff
path: root/src/merge_driver.c
Commit message (Expand)AuthorAgeFilesLines
* merge_driver: fix missing `goto done;`Patrick Steinhardt2016-04-011-0/+1
* merge driver: remove `check` callbackEdward Thomson2016-03-171-91/+30
* merge driver: correct global initializationEdward Thomson2016-03-171-63/+113
* merge driver: get a pointer to favorEdward Thomson2016-03-171-3/+8
* merge driver: correct indentationEdward Thomson2016-03-171-17/+17
* merge driver: allow custom default driverEdward Thomson2016-03-171-36/+35
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-0/+403