hgbook

annotate en/examples/tour.merge.update.out @ 269:abfe426f7e08

Kill off the hideous pink text from HTML.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Aug 31 12:56:49 2007 -0700 (2007-08-31)
parents
children 1b52bda675d0
rev   line source
bos@144 1 $ \textbf{hg update}
bos@144 2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes