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

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 53bd7fcc4abbf6cb7db73b43d5dde477f5115f90..de38c7f7aab16a0c2766ef020a3fc03fadece555 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -48,11 +48,11 @@ test_expect_success 'attribute test' '
        attr_check a/b/g a/b/g &&
        attr_check b/g unspecified &&
        attr_check a/b/h a/b/h &&
-       attr_check a/b/d/g "a/b/d/*"
-       attr_check onoff unset
-       attr_check offon set
-       attr_check no unspecified
-       attr_check a/b/d/no "a/b/d/*"
+       attr_check a/b/d/g "a/b/d/*" &&
+       attr_check onoff unset &&
+       attr_check offon set &&
+       attr_check no unspecified &&
+       attr_check a/b/d/no "a/b/d/*" &&
        attr_check a/b/d/yes unspecified
 
 '