X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mergetools%2Fbc3;fp=mergetools%2Fbc3;h=27b3dd48b840139acd65ea742e04221c6400a485;hb=bc7a96a8965d4ce0651689301e1702a942dfb9f0;hp=0000000000000000000000000000000000000000;hpb=240dc3e8edb3ae4ee968febc006fa761811c60e6;p=git.git

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
+}