Merge branch 'rs/grep-h-c'

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 3db3bf66517919eb3374668581906c730cc20803..82e18548c39817dec496766d2c8d500668fc4f76 100755 (executable)
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -518,7 +518,7 @@ test_expect_success 'reset and bind merge' '
 
 '
 
-test_expect_failure 'merge-recursive w/ empty work tree - ours has rename' '
+test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
        (
                GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
                export GIT_WORK_TREE &&