hgbook
annotate en/examples/results/tour-merge-conflict.merge.out @ 563:44d1363234d2
Move example output files into examples/results
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
| parents | en/examples/tour-merge-conflict.merge.out@bc14f94e726a |
| children | 0d5935744f87 |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{export HGMERGE=merge} |
| bos@549 | 2 $ \textbf{echo 'XXX this is broken and must be fixed'} |
| bos@549 | 3 XXX this is broken and must be fixed |
| bos@144 | 4 $ \textbf{hg merge} |
| bos@144 | 5 merging letter.txt |
| bos@144 | 6 merge: warning: conflicts during merge |
| bos@144 | 7 merging letter.txt failed! |
| bos@144 | 8 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| bos@549 | 9 use 'hg resolve' to retry unresolved file merges |
| bos@144 | 10 $ \textbf{cat letter.txt} |
| bos@144 | 11 Greetings! |
| bos@144 | 12 |
| bos@144 | 13 I am Shehu Musa Abacha, cousin to the former |
| bos@144 | 14 ======= |
| bos@144 | 15 I am Alhaji Abba Abacha, son of the former |
| bos@144 | 16 |
| bos@144 | 17 Nigerian dictator Sani Abacha. |