Mercurial > hgbook

annotate ja/examples/tour.merge.update.out @ 800:1a30d2627512

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propagate 2ff0a43f1152 Update ch03
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Jun 2009 20:04:44 +0900
parents b0db5adf11c1
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}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes