Merge branch 'maint'

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 2586f864a0df4d8c6fb2c7ca0824a6d53ce0520d..ebdccf9a1eb9f9bb4918fc5adee8bdb8fd682608 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -10,6 +10,11 @@ Testing basic diff tool invocation
 
 . ./test-lib.sh
 
+if ! test_have_prereq PERL; then
+       say 'skipping difftool tests, perl not available'
+       test_done
+fi
+
 remove_config_vars()
 {
        # Unset all config variables used by git-difftool