summaryrefslogtreecommitdiff
path: root/tests/merge/trees/trivial.c
Commit message (Expand)AuthorAgeFilesLines
* fileops: rename to "futils.h" to match function signaturesPatrick Steinhardt2019-07-201-1/+1
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-131-1/+1
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-1/+1
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-1/+1
* Introduce cl_assert_equal_oidEdward Thomson2014-07-011-1/+1
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-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-105/+14
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-1/+1
* Rename tests-clar to testsBen Straub2013-11-141-0/+397