From 1ac91b32b5f153a91c10fb236a3769541be60ae9 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Thu, 11 Aug 2011 23:20:21 -0600 Subject: 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 Signed-off-by: Junio C Hamano --- t/t6042-merge-rename-corner-cases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t6042-merge-rename-corner-cases.sh') diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 3be505931..687591991 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 && -- cgit v1.2.1