hgbook
diff 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 diff
1.1 --- a/en/examples/results/tour-merge-conflict.merge.out Mon Mar 09 21:39:23 2009 -0700 1.2 +++ b/en/examples/results/tour-merge-conflict.merge.out Tue Mar 31 12:19:01 2009 -0700 1.3 @@ -1,3 +1,4 @@ 1.4 +<!-- BEGIN tour-merge-conflict.merge --> 1.5 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> 1.6 <prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput> 1.7 XXX this is broken and must be fixed 1.8 @@ -6,13 +7,14 @@ 1.9 merge: warning: conflicts during merge 1.10 merging letter.txt failed! 1.11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 1.12 -use 'hg resolve' to retry unresolved file merges 1.13 +use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon 1.14 <prompt>$</prompt> <userinput>cat letter.txt</userinput> 1.15 Greetings! 1.16 -<<<<<<< /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt 1.17 +<<<<<<< /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt 1.18 I am Shehu Musa Abacha, cousin to the former 1.19 ======= 1.20 I am Alhaji Abba Abacha, son of the former 1.21 ->>>>>>> /tmp/letter.txt~other.1ctEYy 1.22 +>>>>>>> /tmp/letter.txt~other.EVdwH3 1.23 Nigerian dictator Sani Abacha. 1.24 </screen> 1.25 +<!-- END tour-merge-conflict.merge -->