diff options
Diffstat (limited to 'third_party/git/mergetools/ecmerge')
| -rw-r--r-- | third_party/git/mergetools/ecmerge | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/git/mergetools/ecmerge b/third_party/git/mergetools/ecmerge new file mode 100644 index 0000000000..6c5101c4f7 --- /dev/null +++ b/third_party/git/mergetools/ecmerge @@ -0,0 +1,14 @@ +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 +} |