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