| commit | 7d82b06d2be1b872a1debf79fadf0585afc70b69 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Tue, 8 Jun 2010 11:34:12 +0000 (8 13:34 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Jun 2010 16:01:07 +0000 (11 09:01 -0700) | ||
| tree | 9543032d343225699ef5056712d65c27d985c91b | treesnapshot (tar.gz zip) |
| parent | 19b9b0b220be08025d4db9a1c85e21637bf8fd95 | commitdiff |
merge-recursive: demonstrate an incorrect conflict with submodule
When one side of a merge turns a directory into a submodule, and the other
side does not touch that directory (but has other non-conflicting changes),
then a merge should succeed. But currently, it does not; it rather fails
with a file/directory conflict.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When one side of a merge turns a directory into a submodule, and the other
side does not touch that directory (but has other non-conflicting changes),
then a merge should succeed. But currently, it does not; it rather fails
with a file/directory conflict.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3030-merge-recursive.sh | diffblobblamehistory |