Mercurial > hgbook

annotate en/examples/tour.merge.update.out @ 427:b7d284121f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from somewhere else
author jerojasro@localhost
date Thu, 16 Oct 2008 23:25:41 -0500
parents 1b52bda675d0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg update}
405
1b52bda675d0 Fix sample output for 'tour' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 144
diff changeset
2 abort: crosses branches (use 'hg merge' or 'hg update -C')