summaryrefslogtreecommitdiff
path: root/tests/merge/merge_helpers.h
Commit message (Expand)AuthorAgeFilesLines
* merge tests: move expected data into own fileEdward Thomson2015-11-251-43/+0
* Factor 40 and 41 constants from source.Ciro Santilli2014-09-161-4/+4
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-1/+1
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-3/+3
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-1/+2
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-0/+43
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+5
* Rename tests-clar to testsBen Straub2013-11-141-0/+62