diff options
Diffstat (limited to 'mergetools/kdiff3')
| -rw-r--r-- | mergetools/kdiff3 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 520cb91..ee8b3a05 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -4,6 +4,10 @@ diff_cmd () { "$LOCAL" "$REMOTE" >/dev/null 2>&1 } +diff_cmd_help () { + echo "Use KDiff3 (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -22,6 +26,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use KDiff3 (requires a graphical session)" +} + exit_code_trustable () { true } |