--- a/.hgrc	Tue Oct 29 20:19:23 2013 +0200
+++ b/.hgrc	Tue Dec 17 10:21:15 2013 +0200
@@ -14,7 +14,11 @@
 log = -v
 incoming = -v
 outgoing = -v
-diff = --git
+
+[diff]
+git = 1
+unified = 5
+showfunc = 1
 
 [merge-tools]
 emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"