diff options
Diffstat (limited to 'mergetools/diffuse')
-rw-r--r-- | mergetools/diffuse | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/diffuse b/mergetools/diffuse index 5a3ae8b569..ebfaba5172 100644 --- a/mergetools/diffuse +++ b/mergetools/diffuse @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } +diff_cmd_help () { + echo "Use Diffuse (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -13,3 +17,7 @@ merge_cmd () { "$LOCAL" "$MERGED" "$REMOTE" | cat fi } + +merge_cmd_help () { + echo "Use Diffuse (requires a graphical session)" +} |