projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5804023) | patch
t6042: Add a pair of cases where undetected renames cause issues
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:36 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:31 +0000 (14:19 -0700)
commit7b4ed5941c0d2143cb4467a9e265993121b62ce7
tree98e963103aaa5e2461d89f0380933719e82b9b0dtree | snapshot
parent58040239f59004f71d9ae70d0fcd9e0d4f6a3259commit | diff
t6042: Add a pair of cases where undetected renames cause issues

An undetected rename can cause a silent success where a conflict should
have been detected, or can cause an erroneous conflict state where the
merge should have been resolvable.  Add testcases for both.

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