diff options
Diffstat (limited to 'mergetools/opendiff')
| -rw-r--r-- | mergetools/opendiff | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/opendiff b/mergetools/opendiff index b608dd6..44adf8f 100644 --- a/mergetools/opendiff +++ b/mergetools/opendiff @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } +diff_cmd_help () { + echo "Use FileMerge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -12,3 +16,7 @@ merge_cmd () { -merge "$MERGED" | cat fi } + +merge_cmd_help () { + echo "Use FileMerge (requires a graphical session)" +} |