diff options
Diffstat (limited to 'mergetools/emerge')
| -rw-r--r-- | mergetools/emerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/emerge b/mergetools/emerge index d1ce513..fc6892c 100644 --- a/mergetools/emerge +++ b/mergetools/emerge @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" } +diff_cmd_help () { + echo "Use Emacs' Emerge" +} + merge_cmd () { if $base_present then @@ -17,6 +21,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use Emacs' Emerge" +} + translate_merge_tool_path() { echo emacs } |