hgbook

view ja/examples/tour.merge.update.out @ 709:f9f71850ae1a

Merge with foozy
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Aug 14 12:10:47 2009 -0700 (2009-08-14)
parents
children
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes