1 files changed, 20 insertions, 0 deletions
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
+}