hgbook
diff en/examples/results/tour-merge-conflict.merge.out @ 605:a21668c4af50
Add top-level README
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri Mar 27 10:08:39 2009 -0700 (2009-03-27) |
parents | 44d1363234d2 |
children | 4432ad34b8e5 |
line diff
1.1 --- a/en/examples/results/tour-merge-conflict.merge.out Mon Mar 09 21:37:47 2009 -0700 1.2 +++ b/en/examples/results/tour-merge-conflict.merge.out Fri Mar 27 10:08:39 2009 -0700 1.3 @@ -1,17 +1,18 @@ 1.4 -$ \textbf{export HGMERGE=merge} 1.5 -$ \textbf{echo 'XXX this is broken and must be fixed'} 1.6 +<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> 1.7 +<prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput> 1.8 XXX this is broken and must be fixed 1.9 -$ \textbf{hg merge} 1.10 +<prompt>$</prompt> <userinput>hg merge</userinput> 1.11 merging letter.txt 1.12 merge: warning: conflicts during merge 1.13 merging letter.txt failed! 1.14 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 1.15 use 'hg resolve' to retry unresolved file merges 1.16 -$ \textbf{cat letter.txt} 1.17 +<prompt>$</prompt> <userinput>cat letter.txt</userinput> 1.18 Greetings! 1.19 - 1.20 +<<<<<<< /tmp/tour-merge-conflictBrdfE0/scam-merge/letter.txt 1.21 I am Shehu Musa Abacha, cousin to the former 1.22 ======= 1.23 I am Alhaji Abba Abacha, son of the former 1.24 - 1.25 +>>>>>>> /tmp/letter.txt~other.1ctEYy 1.26 Nigerian dictator Sani Abacha. 1.27 +</screen>