aboutsummaryrefslogtreecommitdiff
path: root/mergetools/bc3
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/bc3')
-rw-r--r--mergetools/bc320
1 files changed, 20 insertions, 0 deletions
diff --git a/mergetools/bc3 b/mergetools/bc3
new file mode 100644
index 000000000..27b3dd48b
--- /dev/null
+++ b/mergetools/bc3
@@ -0,0 +1,20 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
+ -mergeoutput="$MERGED"
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -mergeoutput="$MERGED"
+ fi
+ check_unchanged
+}
+
+translate_merge_tool_path() {
+ echo bcompare
+}