hgbook

annotate en/examples/tour.merge.update.out @ 253:bdd271cf1ae1

find changesets by author, revision, files, or words in the commit message
Update expected output.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:05:35 2007 -0700 (2007-05-30)
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