merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 710be90489b2fd5d6ca1a98201c1ec635efcae9f..8dbe950bb09bad34b46496508b2afd0242a8d2aa 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -426,10 +426,10 @@ test_expect_success SANITY 'removal failure' '
 
        mkdir foo &&
        touch foo/bar &&
+       test_when_finished "chmod 755 foo" &&
        (exec <foo/bar &&
         chmod 0 foo &&
-        test_must_fail git clean -f -d &&
-        chmod 755 foo)
+        test_must_fail git clean -f -d)
 '
 
 test_expect_success 'nested git work tree' '