diff options
Diffstat (limited to 'mergetools/ecmerge')
| -rw-r--r-- | mergetools/ecmerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/ecmerge b/mergetools/ecmerge index 6c5101c..0d4d609 100644 --- a/mergetools/ecmerge +++ b/mergetools/ecmerge @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" } +diff_cmd_help () { + echo "Use ECMerge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -12,3 +16,7 @@ merge_cmd () { --default --mode=merge2 --to="$MERGED" fi } + +merge_cmd_help () { + echo "Use ECMerge (requires a graphical session)" +} |