hgbook

annotate en/examples/tour.merge.update.out @ 314:231c8469a0ec

find changesets by author, revision, files, or words in the commit message
Removed a paragraph that is no longer true as of Subversion 1.5.
author Sean Russell <ser@ser1.net>
date Thu Aug 21 23:07:36 2008 -0400 (2008-08-21)
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')