log .hgrc @ 338:3f3d52956ff7

age author description
Fri, 18 Jul 2014 20:15:41 -0400 Augie Fackler hgrc: use detailed merge markers by default