difftool: fallback on merge.guitool

diff --git a/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
index 2a267e84cdaebce5b0a1e043521c68204d16eb6c..656ac7fe9dc1074c5173bcfcf96503b65f33c2f5 100755 (executable)
--- a/t/t6110-rev-list-sparse.sh
+++ b/t/t6110-rev-list-sparse.sh
@@ -3,13 +3,6 @@
 test_description='operations that cull histories in unusual ways'
 . ./test-lib.sh
 
-test_commit () {
-       echo "$1" >"$1.file" &&
-       git add "$1.file" &&
-       test_tick &&
-       git commit -m "$1"
-}
-
 test_expect_success setup '
        test_commit A &&
        test_commit B &&