diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:29 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:40 -0700 |
| commit | 6d63070cacf88cd03b4bc73fd64fea046accd450 (patch) | |
| tree | 812502fc3d4ec37dc712937ae9898b18e1e2b901 /patch-delta.c | |
| parent | b630b8147055a6fd56edfdf3ba85e9dea27dd397 (diff) | |
| download | git-6d63070cacf88cd03b4bc73fd64fea046accd450.tar.gz git-6d63070cacf88cd03b4bc73fd64fea046accd450.tar.xz | |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'patch-delta.c')
0 files changed, 0 insertions, 0 deletions