projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1ac91b3) | patch
merge-recursive: Fix working copy handling for rename/rename/add/add
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:22 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commit3672c971483020ba5255576aec0be670c76d019b
treeae5d39fd2a1a1272a5e8c72ac71c99920f950461tree | snapshot
parent1ac91b32b5f153a91c10fb236a3769541be60ae9commit | diff
merge-recursive: Fix working copy handling for rename/rename/add/add

If either side of a rename/rename(1to2) conflict is itself also involved
in a rename/add-dest conflict, then we need to make sure both the rename
and the added file appear in the working copy.

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