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

diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh
index b4554041b49d1ab7b56430f2e85b76a23d360fb4..c4282179b387c75e084d05075a7fd365c3220cdc 100755 (executable)
--- a/t/t3306-notes-prune.sh
+++ b/t/t3306-notes-prune.sh
@@ -67,7 +67,7 @@ test_expect_success 'remove some commits' '
 
 test_expect_success 'verify that commits are gone' '
 
-       ! git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
+       test_must_fail git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
        git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 &&
        git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f
 '
@@ -106,7 +106,7 @@ test_expect_success 'prune notes' '
 
 test_expect_success 'verify that notes are gone' '
 
-       ! git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
+       test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
        git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
        git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
 '
@@ -130,8 +130,8 @@ test_expect_success 'prune -v notes' '
 
 test_expect_success 'verify that notes are gone' '
 
-       ! git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
-       ! git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
+       test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
+       test_must_fail git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 &&
        git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f
 '