diff options
Diffstat (limited to 'mergetools/smerge')
| -rw-r--r-- | mergetools/smerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/smerge b/mergetools/smerge index 9c2e6f6fd7..5410835a6b 100644 --- a/mergetools/smerge +++ b/mergetools/smerge @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" } +diff_cmd_help () { + echo "Use Sublime Merge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -10,3 +14,7 @@ merge_cmd () { "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED" fi } + +merge_cmd_help () { + echo "Use Sublime Merge (requires a graphical session)" +} |