diff .shell.d/50.common_env.sh @ 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 615fee88aa08
children 1e4a6dcc043d
line wrap: on
line diff