conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 9bf190e03f55fa1cf4b771a4c9adfcdef2e875d7..0b6700242ce7faeb68ab0c6a1facf6460fb48634 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -692,7 +692,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
        git commit -m "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-redo^0 &&
        test_must_fail git merge --strategy=recursive second-rename-redo &&