git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b630b81)
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
authorElijah Newren <redacted>
Fri, 12 Aug 2011 05:20:29 +0000 (23:20 -0600)
committerJunio C Hamano <redacted>
Sun, 14 Aug 2011 21:19:40 +0000 (14:19 -0700)
commit6d63070cacf88cd03b4bc73fd64fea046accd450
tree812502fc3d4ec37dc712937ae9898b18e1e2b901tree | snapshot
parentb630b8147055a6fd56edfdf3ba85e9dea27dd397commit | diff
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

Earlier in this series, the patch "merge-recursive: add handling for
rename/rename/add-dest/add-dest" added code to handle the rename on each
side of history also being involved in a rename/add conflict, but only
did so in the non-recursive case.  Add code for the recursive case,
ensuring that the "added" files are not simply deleted.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
t/t6036-recursive-corner-cases.sh diff | blob | history
git clone https://git.99rst.org/PROJECT