hgbook

annotate en/examples/tour.merge.update.out @ 341:44dd3583c605

find changesets by author, revision, files, or words in the commit message
translated almost 2 sections
author jerojasro@localhost
date Sat Oct 18 23:29:33 2008 -0500 (2008-10-18)
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')