hgbook

view ja/examples/tour.merge.update.out @ 1098:f01108de23c3

2.7.1.2 zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Tue Nov 24 21:59:43 2009 -0500 (2009-11-24)
parents
children
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes