summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/trivial.c
Commit message (Expand)AuthorAgeFilesLines
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-1/+1
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-1/+1
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-4/+4
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-3/+1
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-2/+1
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-1/+1
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-2/+2
* Remove the "merge none" flagEdward Thomson2014-01-201-90/+14
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-1/+1
* refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-151-1/+1
* Rename tests-clar to testsBen Straub2013-11-141-0/+341