summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/recursive.c
Commit message (Expand)AuthorAgeFilesLines
* str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstrEdward Thomson2021-10-171-4/+4
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-2/+2
* merge: reverse merge bases for recursive mergeEdward Thomson2018-02-041-5/+5
* merge: recursive uses larger conflict markersEdward Thomson2018-01-211-2/+2
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-1/+34
* recursive: test conflict output during recursive mergeEdward Thomson2015-11-251-0/+51