X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mergetools%2Femerge;fp=mergetools%2Femerge;h=f96d9e550a138d395ccb23c9496111630d2de594;hb=bc7a96a8965d4ce0651689301e1702a942dfb9f0;hp=0000000000000000000000000000000000000000;hpb=240dc3e8edb3ae4ee968febc006fa761811c60e6;p=git.git

diff --git a/mergetools/emerge b/mergetools/emerge
new file mode 100644
index 000000000..f96d9e550
--- /dev/null
+++ b/mergetools/emerge
@@ -0,0 +1,23 @@
+diff_cmd () {
+	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" \
+			-f emerge-files-with-ancestor-command \
+			"$LOCAL" "$REMOTE" "$BASE" \
+			"$(basename "$MERGED")"
+	else
+		"$merge_tool_path" \
+			-f emerge-files-command \
+			"$LOCAL" "$REMOTE" \
+			"$(basename "$MERGED")"
+	fi
+	status=$?
+}
+
+translate_merge_tool_path() {
+	echo emacs
+}