| commit | 707983484b7dcdd5fe3e09b30d0fdf6dac89c940 | |
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:28:41 +0000 (20 02:28 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:32:36 +0000 (29 17:32 -0700) | ||
| tree | b8e62ff1c6964f8f2af3c343730aedef47df1c3b | treesnapshot (tar.gz zip) |
| parent | 52304ecddf9458dcf4321c89c96a5e1bc025676d | commitdiff |
t6022: Add tests for rename/rename combined with D/F conflicts
Add tests where one file is renamed to two different paths in different
sides of history, and where each of the new files matches the name of a
directory from the opposite side of history. Include tests for both the
case where the merge results in those directories not being cleanly
removed, and where those directories are cleanly removed during the merge.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add tests where one file is renamed to two different paths in different
sides of history, and where each of the new files matches the name of a
directory from the opposite side of history. Include tests for both the
case where the merge results in those directories not being cleanly
removed, and where those directories are cleanly removed during the merge.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6022-merge-rename.sh | diffblobblamehistory |