--- a/.hgrc	Sun Dec 21 18:01:18 2014 +0800
+++ b/.hgrc	Sun Dec 21 20:23:19 2014 +0800
@@ -2,6 +2,7 @@
 username = Anton Shestakov <engored@ya.ru>
 ssh = ssh -C
 editor = ~/.hgeditor
+mergemarkers = detailed
 
 [extensions]
 record =