about summary refs log tree commit diff
path: root/mergetools/codecompare
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/codecompare')
-rw-r--r--mergetools/codecompare23
1 files changed, 23 insertions, 0 deletions
diff --git a/mergetools/codecompare b/mergetools/codecompare
new file mode 100644
index 000000000000..9f60e8da6527
--- /dev/null
+++ b/mergetools/codecompare
@@ -0,0 +1,23 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
+			-RF="$MERGED"
+	else
+		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
+			-RF="$MERGED"
+	fi
+}
+
+translate_merge_tool_path() {
+	if merge_mode
+	then
+		echo CodeMerge
+	else
+		echo CodeCompare
+	fi
+}