hgbook

view ja/examples/tour.merge.update.out @ 1030:2ac31ea48a3d

find changesets by author, revision, files, or words in the commit message
merge with trunk
author Romain PELISSE <belaran@gmail.com>
date Thu Apr 22 12:39:32 2010 +0200 (2010-04-22)
parents
children
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes