hgbook

annotate en/examples/tour.merge.update.out @ 510:98fb436b58c1

corrected some typos
author Javier Rojas <jerojasro@devnull.li>
date Mon Jan 12 22:25:40 2009 -0500 (2009-01-12)
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')