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

diff --git a/t/t4111-apply-subdir.sh b/t/t4111-apply-subdir.sh
index d6271ae34bc67c206d5d2f276696d140a4f17d9b..a52d94ae21afe8faaea31721234a912b090e2e08 100755 (executable)
--- a/t/t4111-apply-subdir.sh
+++ b/t/t4111-apply-subdir.sh
@@ -97,7 +97,7 @@ test_expect_success 'apply from .git dir' '
        test_cmp expected .git/file
 '
 
-test_expect_failure 'apply from subdir of .git dir' '
+test_expect_success 'apply from subdir of .git dir' '
        cp postimage expected &&
        cp preimage .git/file &&
        cp preimage .git/objects/file