Merge branch 'pb/mergetool-tool-help-fix'

[thirdparty/git.git] / t / t7610-mergetool.sh

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 70afdd06fa7208a20ac66f1eb6e9e3690d5fe528..6ac75b5d4c0a40ca4a6b8ed8a24fed646689b99f 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -828,4 +828,15 @@ test_expect_success 'mergetool -Oorder-file is honored' '
        test_cmp expect actual
 '
 
+test_expect_success 'mergetool --tool-help shows recognized tools' '
+       # Check a few known tools are correctly shown
+       git mergetool --tool-help >mergetools &&
+       grep vimdiff mergetools &&
+       grep vimdiff3 mergetools &&
+       grep gvimdiff2 mergetools &&
+       grep araxis mergetools &&
+       grep xxdiff mergetools &&
+       grep meld mergetools
+'
+
 test_done