diff options
Diffstat (limited to 'third_party/git/mergetools/ecmerge')
| -rw-r--r-- | third_party/git/mergetools/ecmerge | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/third_party/git/mergetools/ecmerge b/third_party/git/mergetools/ecmerge deleted file mode 100644 index 6c5101c4f7..0000000000 --- a/third_party/git/mergetools/ecmerge +++ /dev/null @@ -1,14 +0,0 @@ -diff_cmd () { - "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ - --default --mode=merge3 --to="$MERGED" - else - "$merge_tool_path" "$LOCAL" "$REMOTE" \ - --default --mode=merge2 --to="$MERGED" - fi -} |