diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:22 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:39 -0700 |
| commit | 3672c971483020ba5255576aec0be670c76d019b (patch) | |
| tree | ae5d39fd2a1a1272a5e8c72ac71c99920f950461 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | merge-recursive: add handling for rename/rename/add-dest/add-dest (diff) | |
| download | git-3672c971483020ba5255576aec0be670c76d019b.tar.gz git-3672c971483020ba5255576aec0be670c76d019b.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions