hgbook

view ja/examples/tour.merge.update.out @ 993:71dbda516572

French translation : merge with Jean Marie Clement's work on ch04-concepts
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Fri Sep 11 14:35:36 2009 +0200 (2009-09-11)
parents
children
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes