summaryrefslogtreecommitdiff
path: root/t/t7609-mergetool--lib.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t7609-mergetool--lib.sh')
-rwxr-xr-xt/t7609-mergetool--lib.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh
new file mode 100755
index 0000000..d848fe6
--- /dev/null
+++ b/t/t7609-mergetool--lib.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+test_description='git mergetool
+
+Testing basic merge tools options'
+
+. ./test-lib.sh
+
+test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
+ . $GIT_BUILD_DIR/mergetools/vimdiff &&
+ run_unit_tests
+'
+
+test_done