hgbook
view 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 |
line source
1 <!-- BEGIN tour-merge-conflict.merge -->
2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
3 <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
4 XXX this is broken and must be fixed
5 <prompt>$</prompt> <userinput>hg merge</userinput>
6 merging letter.txt
7 merge: warning: conflicts during merge
8 merging letter.txt failed!
9 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
10 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
11 <prompt>$</prompt> <userinput>cat letter.txt</userinput>
12 Greetings!
13 <<<<<<< /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt
14 I am Shehu Musa Abacha, cousin to the former
15 =======
16 I am Alhaji Abba Abacha, son of the former
17 >>>>>>> /tmp/letter.txt~other.EVdwH3
18 Nigerian dictator Sani Abacha.
19 </screen>
20 <!-- END tour-merge-conflict.merge -->