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>
Sebastian Schuberth committed
Feb 26, 2011 at 11:52 UTC
f3768a6714e667205d68475df37a889abb59d2d5
1 file changed
+7
lib/mergetool.tcl
+7
@@ -187,6 +187,13 @@ proc merge_resolve_tool2 {} {
187
"$LOCAL" "$REMOTE" "$MERGED"]
188
}
189
}
190
+ bc3 {
191
+ if {$base_stage ne {}} {
192
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"]
193
+ } else {
194
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"]
195
+ }
196
+ }
197
ecmerge {
198
if {$base_stage ne {}} {
199
set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"]