diff options
Diffstat (limited to 'third_party/git/mergetools/emerge')
| -rw-r--r-- | third_party/git/mergetools/emerge | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/third_party/git/mergetools/emerge b/third_party/git/mergetools/emerge deleted file mode 100644 index d1ce513ff5d3..000000000000 --- a/third_party/git/mergetools/emerge +++ /dev/null @@ -1,26 +0,0 @@ -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 -} - -translate_merge_tool_path() { - echo emacs -} - -exit_code_trustable () { - true -} |