From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Sat, 26 Feb 2011 10:52:17 +0000 (+0100)
Subject: mergetool--lib: Add Beyond Compare 3 as a tool
X-Git-Tag: gitgui-0.14.0^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3768a6714e667205d68475df37a889abb59d2d5;p=git.git

mergetool--lib: Add Beyond Compare 3 as a tool

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 249e0cfa9..3c8e73bce 100644
--- a/lib/mergetool.tcl
+++ b/lib/mergetool.tcl
@@ -187,6 +187,13 @@ proc merge_resolve_tool2 {} {
 				 "$LOCAL" "$REMOTE" "$MERGED"]
 		}
 	}
+	bc3 {
+		if {$base_stage ne {}} {
+			set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"]
+		} else {
+			set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"]
+		}
+	}
 	ecmerge {
 		if {$base_stage ne {}} {
 			set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"]