revision.c: introduce --min-parents and --max-parents options

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index b26cabd571503696a2bfa356e4f6ac46febf74ba..cd093bd34730a3dba6eec7719d3b0170e517fb5e 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -96,7 +96,7 @@ test_expect_success FUNNYNAMES \
     "git rm -f 'space embedded' 'tab   embedded' 'newline
 embedded'"
 
-test_expect_success RO_DIR 'Test that "git rm -f" fails if its rm fails' '
+test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
        chmod a-w . &&
        test_must_fail git rm -f baz &&
        chmod 775 .