rebase --rebase-merges: add support for octopus merges

diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
index 23fbe6434abd3f05057d4916f70e5d5b30115b68..7b111a56fdd3e13d34b538e52c2659a8f2e188a2 100755 (executable)
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@ -19,8 +19,8 @@ test_expect_success 'mktemp to nonexistent directory prints filename' '
 
 test_expect_success POSIXPERM,SANITY 'mktemp to unwritable directory prints filename' '
        mkdir cannotwrite &&
-       chmod -w cannotwrite &&
        test_when_finished "chmod +w cannotwrite" &&
+       chmod -w cannotwrite &&
        test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
        grep "cannotwrite/test" err
 '