hgbook

view en/examples/tour.merge.update.out @ 199:58e3a6c76725

find changesets by author, revision, files, or words in the commit message
More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 16 17:37:27 2007 -0700 (2007-04-16)
parents
children 1b52bda675d0
line source
1 $ \textbf{hg update}
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes