annotate en/examples/results/tour-merge-conflict.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
|
|
bos@564
|
2 <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
|
|
bos@549
|
3 XXX this is broken and must be fixed
|
|
bos@564
|
4 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@144
|
5 merging letter.txt
|
|
bos@144
|
6 merge: warning: conflicts during merge
|
|
bos@144
|
7 merging letter.txt failed!
|
|
bos@144
|
8 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
bos@549
|
9 use 'hg resolve' to retry unresolved file merges
|
|
bos@564
|
10 <prompt>$</prompt> <userinput>cat letter.txt</userinput>
|
|
bos@144
|
11 Greetings!
|
|
bos@564
|
12 <<<<<<< /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt
|
|
bos@144
|
13 I am Shehu Musa Abacha, cousin to the former
|
|
bos@144
|
14 =======
|
|
bos@144
|
15 I am Alhaji Abba Abacha, son of the former
|
|
bos@564
|
16 >>>>>>> /tmp/letter.txt~other.1ctEYy
|
|
bos@144
|
17 Nigerian dictator Sani Abacha.
|
|
bos@564
|
18 </screen>
|
