Mercurial > hg > hgrc

changeset 10:2bbe62387fc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable detailed mergemarkers
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Mon, 06 Oct 2014 10:26:02 -0400
parents 7517b41014cf
children 1d141bd96f50
files hgrc
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgrc
+++ b/hgrc
@@ -3,6 +3,7 @@
 merge = emacs
 editor = emacswait
 debugger = ipdb
+mergemarkers = detailed
 
 [merge-tools]
 emacs.executable = emacspause