diff options
Diffstat (limited to 'mergetools/kdiff3')
| -rw-r--r-- | mergetools/kdiff3 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 0264ed5..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,19 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use KDiff3 (requires a graphical session)" +} + exit_code_trustable () { true } + +translate_merge_tool_path() { + if type kdiff3 >/dev/null 2>/dev/null + then + echo kdiff3 + else + mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" + fi +} |