hgbook

annotate ja/examples/tour.merge.update.out @ 1051:8e4e523283b5

2 paras about cvs translated
author zhaopingsun
date Tue Nov 10 15:59:27 2009 -0500 (2009-11-10)
parents
children
rev   line source
foozy@708 1 $ \textbf{hg update}
foozy@708 2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes