hgbook

annotate en/examples/tour.merge.update.out @ 408:56914d368af4

find changesets by author, revision, files, or words in the commit message
Finished translation of intro to spanish
author Igor TAmara <igor@tamarapatino.org>
date Sun Nov 09 21:49:16 2008 -0500 (2008-11-09)
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')