hgbook

view en/examples/tour.merge.update.out @ 288:cac3ac4536e5

Better wording, again per Jim Blandy.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Jan 18 12:01:46 2008 -0800 (2008-01-18)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes