mergetools: add description to all diff/merge tools

[thirdparty/git.git] / mergetools / tortoisemerge

diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index d7ab666a59a2c8690861146bb6ae4874ed48e0de..507edcd444d12f4ebbc9f75b77ed89776904e401 100644 (file)
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -2,6 +2,10 @@ can_diff () {
        return 1
 }
 
+diff_cmd_help () {
+       echo "Use TortoiseMerge (requires a graphical session)"
+}
+
 merge_cmd () {
        if $base_present
        then
@@ -30,3 +34,7 @@ translate_merge_tool_path() {
                echo tortoisemerge
        fi
 }
+
+merge_cmd_help () {
+       echo "Use TortoiseMerge (requires a graphical session)"
+}