diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 07:20:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 23:19:39 +0200 |
| commit | 1ac91b32b5f153a91c10fb236a3769541be60ae9 (patch) | |
| tree | c8816fc69aaa2ca17eaf25d56ac3c004113e4200 /t/t6042-merge-rename-corner-cases.sh | |
| parent | merge-recursive: Have conflict_rename_delete reuse modify/delete code (diff) | |
| download | git-1ac91b32b5f153a91c10fb236a3769541be60ae9.tar.xz git-1ac91b32b5f153a91c10fb236a3769541be60ae9.zip | |
merge-recursive: add handling for rename/rename/add-dest/add-dest
Each side of the rename in rename/rename(1to2) could potentially also be
involved in a rename/add conflict. Ensure stages for such conflicts are
also recorded.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6042-merge-rename-corner-cases.sh')
| -rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 3be5059318..6875919912 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -551,7 +551,7 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' ' git commit -m two ' -test_expect_failure 'rename/rename/add-dest merge still knows about conflicting file versions' ' +test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' ' git checkout C^0 && test_must_fail git merge -s recursive B^0 && |