diff options
Diffstat (limited to 'mergetools/emerge')
| -rw-r--r-- | mergetools/emerge | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/mergetools/emerge b/mergetools/emerge new file mode 100644 index 0000000..f96d9e5 --- /dev/null +++ b/mergetools/emerge @@ -0,0 +1,23 @@ +diff_cmd () { + "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" \ + -f emerge-files-with-ancestor-command \ + "$LOCAL" "$REMOTE" "$BASE" \ + "$(basename "$MERGED")" + else + "$merge_tool_path" \ + -f emerge-files-command \ + "$LOCAL" "$REMOTE" \ + "$(basename "$MERGED")" + fi + status=$? +} + +translate_merge_tool_path() { + echo emacs +} |