hgbook

annotate en/examples/tour.merge.update.out @ 306:1b52bda675d0

find changesets by author, revision, files, or words in the commit message
Fix sample output for 'tour' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:08:24 2008 +0200 (2008-08-20)
parents 006bbad1f190
children
rev   line source
bos@144 1 $ \textbf{hg update}
hg@306 2 abort: crosses branches (use 'hg merge' or 'hg update -C')