diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:43 -0700 |
| commit | 3f1c70f717da3c9ec6ae3744593c7f9f3729aad7 (patch) | |
| tree | 2ae895eba594851c845af80b4d60cd584e59f0b6 /mergetools/ecmerge | |
| parent | Merge branch 'jc/maint-autofix-tag-in-head' (diff) | |
| parent | mergetools/meld: Use '--output' when available (diff) | |
| download | tgif-3f1c70f717da3c9ec6ae3744593c7f9f3729aad7.tar.xz | |
Merge branch 'da/difftool-mergtool-refactor'
* da/difftool-mergtool-refactor:
mergetools/meld: Use '--output' when available
mergetool--lib: Refactor tools into separate files
mergetool--lib: Make style consistent with git
difftool--helper: Make style consistent with git
Diffstat (limited to 'mergetools/ecmerge')
| -rw-r--r-- | mergetools/ecmerge | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mergetools/ecmerge b/mergetools/ecmerge new file mode 100644 index 0000000000..13c2e439de --- /dev/null +++ b/mergetools/ecmerge @@ -0,0 +1,16 @@ +diff_cmd () { + "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" +} + +merge_cmd () { + touch "$BACKUP" + 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 + check_unchanged +} |