From 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <Vincent Ambo>
Date: Sat, 11 Jan 2020 23:36:56 +0000
Subject: Squashed 'third_party/git/' content from commit cb71568594

git-subtree-dir: third_party/git
git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
---
 mergetools/diffuse | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 mergetools/diffuse

(limited to 'mergetools/diffuse')

diff --git a/mergetools/diffuse b/mergetools/diffuse
new file mode 100644
index 000000000000..5a3ae8b5695d
--- /dev/null
+++ b/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
+}
-- 
cgit 1.4.1