[PATCH] Adds emacs to known mergers

[Edouard Gomez]

# HG changeset patch
# User ed.gomez at free.fr
# Node ID ce5432b327230b19bd761020c17c3a0cfe3621ab
# Parent  fba26990604a48dcea3506399409145aed3b7dc8

Add emacs knowledge to hgmerge

diff -r fba26990604a -r ce5432b32723 hgmerge
--- a/hgmerge	Thu Jun 30 18:07:50 2005
+++ b/hgmerge	Thu Jun 30 22:43:02 2005
@@ -51,6 +51,14 @@
     fi
 fi
 
+if which emacs > /dev/null ; then
+    if emacs -eval "(ediff-merge-with-ancestor \"$LOCAL.orig\" \"$OTHER\" \"$BASE\" nil \"$LOCAL\")" ; then
+        exit 0
+    else
+        exit 1
+    fi
+fi
+
 # Attempt to do a merge with $EDITOR
 if which merge > /dev/null ; then
     echo "conflicts detected in $LOCAL"
@@ -79,5 +87,5 @@
     fi
 fi
 
-echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!"
+echo "hgmerge: unable to find merge, tkdiff, kdiff3, emacs, or diff+patch!"
 exit 1

-- 
Edouard Gomez