libgit2/tests/resources/merge-resolve
Edward Thomson 49806e9bc4 merge_trees: introduce test for submodule renames
Test that shows that submodules are incorrectly considered in renames,
and `git_merge_trees` will fail to lookup the submodule as a blob.
2017-02-09 18:13:06 +00:00
..
.gitted merge_trees: introduce test for submodule renames 2017-02-09 18:13:06 +00:00
added-in-master.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
automergeable.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
changed-in-branch.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
changed-in-master.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
conflicting.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
removed-in-branch.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
unchanged.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00