diff options
Diffstat (limited to 'mergetools/araxis')
| -rw-r--r-- | mergetools/araxis | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/araxis b/mergetools/araxis index e2407b65b7..eb32a7da95 100644 --- 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 } |