mergetools: add description to all diff/merge tools

[thirdparty/git.git] / mergetools / opendiff

diff --git a/mergetools/opendiff b/mergetools/opendiff
index b608dd6de30aaab9b30729145029761330f9fb55..44adf8f95155cb4adb9a29de3ea28ca67ad579e8 100644 (file)
--- a/mergetools/opendiff
+++ b/mergetools/opendiff
@@ -2,6 +2,10 @@ diff_cmd () {
        "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
 }
 
+diff_cmd_help () {
+       echo "Use FileMerge (requires a graphical session)"
+}
+
 merge_cmd () {
        if $base_present
        then
@@ -12,3 +16,7 @@ merge_cmd () {
                        -merge "$MERGED" | cat
        fi
 }
+
+merge_cmd_help () {
+       echo "Use FileMerge (requires a graphical session)"
+}