Mercurial > dotfiles

changeset 510:0fffee666bc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: enable mergediffs
author Augie Fackler <raf@durin42.com>
date Thu, 18 Feb 2021 11:16:06 -0500
parents cea9a184de6c
children a6d9af3fdc50
files .hgrc
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgrc
+++ b/.hgrc
@@ -63,6 +63,7 @@ xdiff = 1
 [diff]
 git=1
 showfunc = 1
+merge = 1
 
 [bookmarks]
 track.current = 1