about summary refs log tree commit diff
path: root/third_party/git/mergetools/diffuse
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/mergetools/diffuse')
-rw-r--r--third_party/git/mergetools/diffuse15
1 files changed, 15 insertions, 0 deletions
diff --git a/third_party/git/mergetools/diffuse b/third_party/git/mergetools/diffuse
new file mode 100644
index 000000000000..5a3ae8b5695d
--- /dev/null
+++ b/third_party/git/mergetools/diffuse
@@ -0,0 +1,15 @@
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" \
+			"$LOCAL" "$MERGED" "$REMOTE" \
+			"$BASE" | cat
+	else
+		"$merge_tool_path" \
+			"$LOCAL" "$MERGED" "$REMOTE" | cat
+	fi
+}