hgbook

annotate en/examples/tour.merge.update.out @ 320:97e929385442

find changesets by author, revision, files, or words in the commit message
Small typos, plus a perl regexp match. It was stripping newlines!
author Taavi Burns <taavi@taaviburns.ca>
date Sun Aug 31 12:14:23 2008 -0400 (2008-08-31)
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')