hgbook

annotate ja/examples/tour.merge.update.out @ 985:ac738e7a6bf9

corrected one spelling mistake in fr/appA-svn.xml
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Wed Sep 09 15:15:48 2009 +0200 (2009-09-09)
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