# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1405728941 14400
# Node ID 3f3d52956ff7a1d7077e4f0ab659bafed2a0c978
# Parent  5ce7678830fa4fba39c41f594886a1e0cc3e04f3
hgrc: use detailed merge markers by default

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -31,6 +31,7 @@ wc-email = email -r 'ancestors(.) and no
 username = Augie Fackler <raf@durin42.com>
 ignore = ~/.hgglobalignore
 usehttp2=true
+mergemarkers = detailed
 
 [defaults]
 qimport = --git