diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2007-10-17 19:16:12 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:46:24 -0400 |
| commit | ca8e6b7a55bfeccbd08182205102d44874f787b6 (patch) | |
| tree | b173fdffc64a6e2811c5f6d40e8d324d248a98fd /git-mergetool.sh | |
| parent | e3fa2c761fdc490494e8e0855bcee4d7e58ada6a (diff) | |
| download | git-ca8e6b7a55bfeccbd08182205102d44874f787b6.tar.gz | |
mergetool: add support for ECMerge
Add support to mergetool for ECMerge available from
http://www.elliecomputing.com/Products/merge_overview.asp
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 4f89cbe8e6..94511f9d1a 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -250,6 +250,16 @@ merge_file () { check_unchanged save_backup ;; + ecmerge) + touch "$BACKUP" + if base_present; then + "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$path" + else + "$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$path" + fi + check_unchanged + save_backup + ;; emerge) if base_present ; then "$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$path")" @@ -299,7 +309,7 @@ done valid_tool() { case "$1" in - kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff) + kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge) ;; # happy *) return 1 |