hgbook

view en/examples/tour.merge.update.out @ 291:fe9237037e4d

Fixed sample output for 'branching' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:46:07 2008 +0200 (2008-08-20)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes