diff options
Diffstat (limited to 'mergetools/xxdiff')
| -rw-r--r-- | mergetools/xxdiff | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff index d5ce467..cd205f9 100644 --- a/mergetools/xxdiff +++ b/mergetools/xxdiff @@ -12,6 +12,10 @@ diff_cmd () { fi } +diff_cmd_help () { + echo "Use xxdiff (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -28,3 +32,7 @@ merge_cmd () { --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi } + +merge_cmd_help () { + echo "Use xxdiff (requires a graphical session)" +} |