hgbook

view ja/examples/tour.merge.update.out @ 1055:4f899bb4d0dd

1.6.5 refined
author zhaopingsun
date Tue Nov 10 19:48:42 2009 -0500 (2009-11-10)
parents
children
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes