diff options
Diffstat (limited to 'mergetools/tkdiff')
| -rw-r--r-- | mergetools/tkdiff | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/tkdiff b/mergetools/tkdiff index eee5cb5..66906a7 100644 --- a/mergetools/tkdiff +++ b/mergetools/tkdiff @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } +diff_cmd_help () { + echo "Use TkDiff (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -14,3 +18,7 @@ merge_cmd () { exit_code_trustable () { true } + +merge_cmd_help () { + echo "Use TkDiff (requires a graphical session)" +} |