From 07413c5a3115df424bee1ebe627676df0734f787 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 20 Sep 2010 02:29:00 -0600 Subject: merge-recursive: Move handling of double rename of one file to two Move the handling of rename/rename conflicts where one file is renamed to two different files, from process_renames() to process_df_entry(). Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- t/t6022-merge-rename.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 02dea16459..1f29c0a94d 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -652,7 +652,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa git commit -m "Put one/file in the way, rename to two" ' -test_expect_failure 'check handling of differently renamed file with D/F conflicts' ' +test_expect_success 'check handling of differently renamed file with D/F conflicts' ' git checkout -q first-rename^0 && test_must_fail git merge --strategy=recursive second-rename && -- cgit v1.2.3