--- a/.hgrc	Mon Sep 19 21:08:02 2011 +0300
+++ b/.hgrc	Tue Sep 20 02:00:26 2011 +0300
@@ -12,6 +12,7 @@
 log = -v -f
 incoming = -v
 outgoing = -v
+diff = --git
 
 [merge-tools]
 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"