Mercurial > hgbook

annotate en/examples/results/backout.manual.merge.out @ 750:c15e039d98b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
appB-mq-ref.xml: Typo fix
author Dongsheng Song <dongsheng.song@gmail.com>
date Fri, 20 Mar 2009 16:50:51 +0800
parents 0d5935744f87
children 4432ad34b8e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
1 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 merging myfile
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 (branch merge, don't forget to commit)
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
5 <prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
6 <prompt>$</prompt> <userinput>cat myfile</userinput>
179
5fc4a45c069f Continue documentation of collaboration models.
Bryan O'Sullivan <bos@serpentine.com>
parents: 144
diff changeset
7 first change
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 third change
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
9 </screen>