hgbook

annotate ja/examples/tour.merge.update.out @ 872:102f89d20be1

find changesets by author, revision, files, or words in the commit message
remove spurious 'hg' from mq command line options
author Steve Borho <steve@borho.org>
date Tue Oct 27 22:46:49 2009 -0500 (2009-10-27)
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