hgbook

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

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
line source
1 $ \textbf{hg update}
2 abort: crosses branches (use 'hg merge' or 'hg update -C')