hgbook

annotate en/examples/tour.merge.update.out @ 268:ca475a9e2e59

find changesets by author, revision, files, or words in the commit message
Fix modified example.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Aug 31 12:48:44 2007 -0700 (2007-08-31)
parents
children 1b52bda675d0
rev   line source
bos@144 1 $ \textbf{hg update}
bos@144 2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes