tests/resources/merge-resolve/.gitted/objects


Log

Author Commit Date CI Message
David Turner 2a3e0635 2017-12-04T16:56:07 Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
Edward Thomson 49806e9b 2017-02-09T16:52:03 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.
Edward Thomson 0ef19fe1 2014-01-20T17:13:55 Merge submodules
Edward Thomson 6b92c99b 2014-01-19T01:20:25 Don't try to merge binary files
Ben Straub 17820381 2013-11-14T14:05:52 Rename tests-clar to tests