summaryrefslogtreecommitdiff
path: root/src/merge_driver.h
Commit message (Collapse)AuthorAgeFilesLines
* merge driver: remove `check` callbackEdward Thomson2016-03-171-4/+20
| | | | | | Since the `apply` callback can defer, the `check` callback is not necessary. Removing the `check` callback further makes the `payload` unnecessary along with the `cleanup` callback.
* merge driver: correct global initializationEdward Thomson2016-03-171-0/+44