summaryrefslogtreecommitdiff
path: root/tests/merge/trees/automerge.c
Commit message (Expand)AuthorAgeFilesLines
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-4/+4
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-22/+0
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-1/+1
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-2/+2
* Rename tests-clar to testsBen Straub2013-11-141-0/+217