mergetools: add description to all diff/merge tools

[thirdparty/git.git] / mergetools / araxis

diff --git a/mergetools/araxis b/mergetools/araxis
index e2407b65b70d1e622979cdb2fe0e425ba6403ee1..eb32a7da956dc35ded8e8c129ccb7b23ab13d6a4 100644 (file)
--- a/mergetools/araxis
+++ b/mergetools/araxis
@@ -2,6 +2,10 @@ diff_cmd () {
        "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
 
+diff_cmd_help () {
+       echo "Use Araxis Merge (requires a graphical session)"
+}
+
 merge_cmd () {
        if $base_present
        then
@@ -13,6 +17,10 @@ merge_cmd () {
        fi
 }
 
+merge_cmd_help () {
+       echo "Use Araxis Merge (requires a graphical session)"
+}
+
 translate_merge_tool_path() {
        echo compare
 }