annotate en/examples/results/tour-merge-conflict.merge.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN tour-merge-conflict.merge -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
|
|
bos@549
|
4 XXX this is broken and must be fixed
|
|
bos@564
|
5 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@144
|
6 merging letter.txt
|
|
bos@144
|
7 merge: warning: conflicts during merge
|
|
bos@144
|
8 merging letter.txt failed!
|
|
bos@144
|
9 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
bos@611
|
10 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
|
|
bos@564
|
11 <prompt>$</prompt> <userinput>cat letter.txt</userinput>
|
|
bos@144
|
12 Greetings!
|
|
bos@611
|
13 <<<<<<< /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt
|
|
bos@144
|
14 I am Shehu Musa Abacha, cousin to the former
|
|
bos@144
|
15 =======
|
|
bos@144
|
16 I am Alhaji Abba Abacha, son of the former
|
|
bos@611
|
17 >>>>>>> /tmp/letter.txt~other.EVdwH3
|
|
bos@144
|
18 Nigerian dictator Sani Abacha.
|
|
bos@564
|
19 </screen>
|
|
bos@611
|
20 <!-- END tour-merge-conflict.merge -->
|
