Mercurial > dotfiles

changeset 338:3f3d52956ff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: use detailed merge markers by default
author Augie Fackler <raf@durin42.com>
date Fri, 18 Jul 2014 20:15:41 -0400
parents 5ce7678830fa
children 07053ec3c643
files .hgrc
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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