hgbook

view ja/examples/tour.merge.update.out @ 1090:3c3a2bd7c14e

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