Mercurial > hgbook

annotate en/examples/results/tour-merge-conflict.merge.out @ 709:4432ad34b8e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Mar 2009 12:19:01 -0700
parents 0d5935744f87
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
1 <!-- BEGIN tour-merge-conflict.merge -->
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
3 <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
648
bc14f94e726a Check in a known-broken example to fix up later - XXX
Bryan O'Sullivan <bos@serpentine.com>
parents: 433
diff changeset
4 XXX this is broken and must be fixed
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
5 <prompt>$</prompt> <userinput>hg merge</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 merging letter.txt
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 merge: warning: conflicts during merge
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 merging letter.txt failed!
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
10 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
11 <prompt>$</prompt> <userinput>cat letter.txt</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 Greetings!
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
13 &lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 I am Shehu Musa Abacha, cousin to the former
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 =======
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 I am Alhaji Abba Abacha, son of the former
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
17 &gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/letter.txt~other.EVdwH3
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 Nigerian dictator Sani Abacha.
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
19 </screen>
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
20 <!-- END tour-merge-conflict.merge -->