merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index a19aeb6441cb29dc20478cf898b5f7767d770c94..349eebd54268c927249322dc22fc478869860f7c 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -153,7 +153,8 @@ test_expect_success 'setup: recover' '
 test_expect_success 'Show verbose error when HEAD could not be detached' '
        >B &&
        test_must_fail git rebase topic 2>output.err >output.out &&
-       grep "Untracked working tree file .B. would be overwritten" output.err
+       grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+       grep B output.err
 '
 rm -f B