summaryrefslogtreecommitdiff
path: root/include/git2/sys/merge.h
Commit message (Expand)AuthorAgeFilesLines
* merge driver: remove `check` callbackEdward Thomson2016-03-171-62/+6
* merge driver: improve inline documentationEdward Thomson2016-03-171-18/+21
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-0/+230