projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3398f2f) | patch
t6022: Add tests with both rename source & dest involved in D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:39 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commit588504b694133cba85982fbace532d2156f859eb
tree7d47cc5892a65e3eb5a66f0ac5a44afff0c79125tree | snapshot
parent3398f2f58317e1a22093a0149a5eae1fe208b024commit | diff
t6022: Add tests with both rename source & dest involved in D/F conflicts

Having the source of a rename be involved in a directory/file conflict does
not currently pose any difficulties to the current merge-recursive
algorithm (in contrast to destinations of renames and D/F conflicts).
However, combining the two seemed like good testcases to include for
completeness.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6022-merge-rename.sh diff | blob | history
Git—the stupid content tracker