delta/libgit2.git/tests/resources/merge-resolve, branch ethomson/test_httpsgithub.com: libgit2/libgit2.git
Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict2017-12-04T22:15:00+00:00David Turnerdturner@twosigma.com2017-12-04T21:56:07+00:002a3e06359b8be1c5c53809a56e0fc3af62bdb024
merge_trees: introduce test for submodule renames2017-02-09T18:13:06+00:00Edward Thomsonethomson@github.com2017-02-09T16:52:03+00:0049806e9bc4650ec1112246292fcfe3941eb99268
Test that shows that submodules are incorrectly considered in renames,
and `git_merge_trees` will fail to lookup the submodule as a blob.
Test that shows that submodules are incorrectly considered in renames,
and `git_merge_trees` will fail to lookup the submodule as a blob.
Add `git_merge_status` to provide info about an upcoming merge2014-03-20T16:25:06+00:00Edward Thomsonethomson@microsoft.com2014-03-12T00:19:35+00:00ccb308273a8662a9692849115a929bd1a74a15f7