diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 05:20:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 21:19:36 (GMT) |
| commit | ed0148a520ec2ec88f0574c2e107aba0a46936e1 (patch) | |
| tree | 3566f61d08552b0022f7e75bc6bf548f17d93c6a /t/t6036-recursive-corner-cases.sh | |
| parent | 86d4b528d8a4752cc689279fb6d38c8697a507bb (diff) | |
| download | git-ed0148a520ec2ec88f0574c2e107aba0a46936e1.zip git-ed0148a520ec2ec88f0574c2e107aba0a46936e1.tar.gz git-ed0148a520ec2ec88f0574c2e107aba0a46936e1.tar.bz2 | |
merge-recursive: Allow make_room_for_path() to remove D/F entries
If there were several files conflicting below a directory corresponding
to a D/F conflict, and the file of that D/F conflict is in the way, we
want it to be removed. Since files of D/F conflicts are handled last,
they can be reinstated later and possibly with a new unique name.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index ed6c6f4..279f33c 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -496,7 +496,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict git tag E2 ' -test_expect_failure 'merge of D & E1 fails but has appropriate contents' ' +test_expect_success 'merge of D & E1 fails but has appropriate contents' ' get_clean_checkout D^0 && test_must_fail git merge -s recursive E1^0 && |