hgbook

view en/examples/tour.merge.update.out @ 191:f078515438d2

Account for changed output.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 16 14:39:20 2007 -0700 (2007-04-16)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes