hgbook

annotate en/examples/tour.merge.update.out @ 296:e0b56f008b09

find changesets by author, revision, files, or words in the commit message
Fix sample output for 'backout' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:51:54 2008 +0200 (2008-08-20)
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