summaryrefslogtreecommitdiff
path: root/tests/merge/trees
Commit message (Expand)AuthorAgeFilesLines
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-012-5/+5
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-135-5/+5
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-1/+1
* Add failing test case for virtual commit merge base issueEdward Thomson2018-02-041-0/+23
* merge::trees::recursive: test for virtual base buildingEdward Thomson2018-02-041-0/+25
* merge: reverse merge bases for recursive mergeEdward Thomson2018-02-041-10/+10
* merge: recursive uses larger conflict markersEdward Thomson2018-01-211-2/+2
* merge_trees: introduce test for submodule renamesEdward Thomson2017-02-091-0/+22
* merge: set default rename thresholdEdward Thomson2017-01-011-0/+2
* git_diff_generated: abstract generated diffsEdward Thomson2016-05-261-0/+1
* recursive merge: add a recursion limitEdward Thomson2015-11-251-0/+31
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-0/+80
* merge tests: add complex recursive exampleEdward Thomson2015-11-251-0/+28
* merge tests: move expected data into own fileEdward Thomson2015-11-252-1/+3
* merge: add recursive test with conflicting contentsEdward Thomson2015-11-251-0/+23
* merge: add recursive test with three merge basesEdward Thomson2015-11-251-0/+46
* merge: improve test names in recursive merge testsEdward Thomson2015-11-251-8/+8
* merge: add a third-level recursive mergeEdward Thomson2015-11-251-0/+46
* merge: add a second-level recursive mergeEdward Thomson2015-11-251-2/+48
* merge: add simple recursive testEdward Thomson2015-11-251-0/+110
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-252-2/+2
* merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-221-1/+17
* iterator: use an options struct instead of argsEdward Thomson2015-08-281-6/+6
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-1/+1
* merge: merge iteratorsEdward Thomson2015-05-111-1/+13
* Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-161-2/+2
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-1/+1
* Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-161-0/+82
* hashsig: Export as a `sys` headervmg/hashsigVicent Marti2014-10-011-1/+1
* Introduce cl_assert_equal_oidEdward Thomson2014-07-011-1/+1
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-205-11/+11
* Introduce git_merge_file for consumersEdward Thomson2014-03-202-33/+0
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-253-4/+4
* Remove the "merge none" flagEdward Thomson2014-01-201-105/+14
* merge_file should use more aggressive levelsEdward Thomson2014-01-202-3/+3
* Clean up warningsEdward Thomson2013-12-091-22/+0
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+164
* Rename tests-clar to testsBen Straub2013-11-145-0/+1467
View Lorry Controller Status