diff .zshrc @ 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 a7f5b0526a51
children b78aa03c0c00
line wrap: on
line diff