Mercurial > hgbook

annotate en/examples/tour.merge.update.out @ 146:65f6f9d18fa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Oops! I forgot that I need the undoctored output files in the book! Now they're named "*.lxo", instead of "*.out". Ugh.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:55:48 -0800
parents 006bbad1f190
children 1b52bda675d0
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