From 76278801e7012e33b0f501858ca050983e07215d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 16 Jul 2017 16:22:04 -0400
Subject: Add a `git-mergetool` stub for ediff

---
 ediff.git-mergetool | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 ediff.git-mergetool

(limited to 'ediff.git-mergetool')

diff --git a/ediff.git-mergetool b/ediff.git-mergetool
new file mode 100644
index 0000000..8a267bd
--- /dev/null
+++ b/ediff.git-mergetool
@@ -0,0 +1,20 @@
+diff_cmd () {
+	"$merge_tool_path" -c "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" -c \
+			-3 "$LOCAL" "$REMOTE" "$BASE" \
+			-m "$MERGED"
+	else
+		"$merge_tool_path" -c \
+			"$LOCAL" "$REMOTE" \
+			-m "$MERGED"
+	fi
+}
+
+exit_code_trustable () {
+	true
+}
-- 
cgit v1.2.3