# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1613664966 18000
# Node ID 0fffee666bc72c9a0628c558b2c42f2e815af268
# Parent  cea9a184de6c888bdb4a431ee18270a4b7df4653
hgrc: enable mergediffs

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -63,6 +63,7 @@ xdiff = 1
 [diff]
 git=1
 showfunc = 1
+merge = 1
 
 [bookmarks]
 track.current = 1