summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/mergetool.tcl7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 249e0cfa93..3c8e73bceb 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"]