diff options
Diffstat (limited to 'mergetools/guiffy')
| -rw-r--r-- | mergetools/guiffy | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/guiffy b/mergetools/guiffy index 8b23a13..3ed07ef 100644 --- a/mergetools/guiffy +++ b/mergetools/guiffy @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } +diff_cmd_help () { + echo "Use Guiffy's Diff Tool (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -13,6 +17,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use Guiffy's Diff Tool (requires a graphical session)" +} + exit_code_trustable () { true } |