diff .shell.d/99.misc.zsh @ 338:3f3d52956ff7

hgrc: use detailed merge markers by default
author Augie Fackler <raf@durin42.com>
date Fri, 18 Jul 2014 20:15:41 -0400
parents e9932cf1692f
children
line wrap: on
line diff