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>
Steffen Prohaska committed
Oct 17, 2007 at 19:16 UTC
ca8e6b7a55bfeccbd08182205102d44874f787b6
2 files changed
+12
-2
Documentation/git-mergetool.txt
+1
-1
@@ -25,7 +25,7 @@ OPTIONS
25
-t or --tool=<tool>::
26
Use the merge resolution program specified by <tool>.
27
Valid merge tools are:
28
- kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
28
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
29
+
30
If a merge resolution program is not specified, 'git mergetool'
31
will use the configuration variable merge.tool. If the
git-mergetool.sh
+11
-1
@@ -250,6 +250,16 @@ merge_file () {
250
check_unchanged
251
save_backup
252
;;
253
+ ecmerge)
254
+ touch "$BACKUP"
255
+ if base_present; then
256
+ "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$path"
257
+ else
258
+ "$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$path"
259
+ fi
260
+ check_unchanged
261
+ save_backup
262
+ ;;
263
emerge)
264
if base_present ; then
265
"$merge_tool_path" -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$(basename "$path")"
@@ -299,7 +309,7 @@ done
309
310
valid_tool() {
311
case "$1" in
302
- kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff)
312
+ kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
313
;; # happy
314
*)
315
return 1