diff -r 54a04b2de8bb -r 1a0686b5c40e .hgrc
--- a/.hgrc	Wed Jan 15 19:28:16 2014 +0200
+++ b/.hgrc	Wed Jan 15 19:29:22 2014 +0200
@@ -25,9 +25,6 @@
 ignorewsamount = True
 ignoreblanklines = True
 
-[merge-tools]
-emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"
-
 [web]
 encoding = utf-8