diff contrib/sample.hgrc @ 17144:71e36b3d2cc4 stable

update: mention how update can be used to cancel an uncommitted merge
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 10 Jul 2012 21:26:18 +0200
parents 5f01fd602542
children 216d3d85372b
line wrap: on
line diff