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