diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2010-06-08 13:34:12 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-06-11 09:01:07 -0700 |
| commit | 7d82b06d2be1b872a1debf79fadf0585afc70b69 (patch) | |
| tree | 9543032d343225699ef5056712d65c27d985c91b /git-cvsimport.perl | |
| parent | Makefile: default pager on AIX to "more" (diff) | |
| download | tgif-7d82b06d2be1b872a1debf79fadf0585afc70b69.tar.xz | |
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>
Diffstat (limited to 'git-cvsimport.perl')
0 files changed, 0 insertions, 0 deletions