diff options
Diffstat (limited to 'mergetools/diffmerge')
| -rw-r--r-- | mergetools/diffmerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge index 9b6355b98a..9b5b62d1ca 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } +diff_cmd_help () { + echo "Use DiffMerge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -13,6 +17,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use DiffMerge (requires a graphical session)" +} + exit_code_trustable () { true } |