# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1310817744 -10800
# Node ID 90f8794f2290d1750a34cdf0e7b274af3986c46d
# Parent  27f3838581598a79c1b2b906fc06d92d68da0c30
Add emacs merge tool.

diff -r 27f383858159 -r 90f8794f2290 .hgrc
--- a/.hgrc	Sat Jul 16 14:57:27 2011 +0300
+++ b/.hgrc	Sat Jul 16 15:02:24 2011 +0300
@@ -13,6 +13,9 @@
 incoming = -v
 outgoing = -v
 
+[merge-tools]
+emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"
+
 [web]
 encoding = utf-8