Merge branch 'jc/conflict-marker-size'

diff --git a/t/lib-patch-mode.sh b/t/lib-patch-mode.sh
index afb4b6686c8acc8f274fbaacbb7380adcbd23648..75a3ee283d49f4ddc3ba05fbb9999de75d2a75f0 100755 (executable)
--- a/t/lib-patch-mode.sh
+++ b/t/lib-patch-mode.sh
@@ -1,5 +1,10 @@
 . ./test-lib.sh
 
+if ! test_have_prereq PERL; then
+       say 'skipping --patch tests, perl not available'
+       test_done
+fi
+
 set_state () {
        echo "$3" > "$1" &&
        git add "$1" &&