| commit | 594a8673f227e9a00b3b0c4d6a26c97d68651666 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 11 Jul 2018 03:56:57 +0000 (10 20:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Jul 2018 16:40:03 +0000 (11 09:40 -0700) | ||
| tree | 8ee59ed5badacd6b6970f3a4b3aa52619440d182 | treesnapshot (tar.gz zip) |
| parent | e3331758f12da22f4103eec7efe1b5304a9be5e9 | commitdiff |
t7405: add a file/submodule conflict
In the case of a file/submodule conflict, although both cannot exist at
the same path, we expect both to be present somewhere for the user to be
able to resolve the conflict with. Add a testcase for this.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In the case of a file/submodule conflict, although both cannot exist at
the same path, we expect both to be present somewhere for the user to be
able to resolve the conflict with. Add a testcase for this.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7405-submodule-merge.sh | diffblobblamehistory |