# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1316473226 -10800
# Node ID aa1b11b44810fa6b36bfe58a89634780d8cae1db
# Parent  5c1ed795a3b395378369d53cafda69a2449ff487# Parent  6fd142910e94a694c8a9e5264c30cd89a856a349
merged

diff -r 5c1ed795a3b3 -r aa1b11b44810 .hgrc
--- 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\")"