summaryrefslogtreecommitdiff
path: root/tests/merge/driver.c
Commit message (Expand)AuthorAgeFilesLines
* str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstrEdward Thomson2021-10-171-10/+18
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-1/+1
* merge drivers: handle configured but not found driverEdward Thomson2016-03-171-0/+18
* merge driver: remove `check` callbackEdward Thomson2016-03-171-124/+7
* merge driver: tests for set and unset merge attributeEdward Thomson2016-03-171-1/+36
* merge driver: tests for custom default merge driversEdward Thomson2016-03-171-0/+59
* merge driver: test GIT_EMERGECONFLICTEdward Thomson2016-03-171-0/+90
* merge driver: test GIT_PASSTHROUGHEdward Thomson2016-03-171-0/+95
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-0/+208