hgbook
annotate en/examples/tour-merge-conflict.merge.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
parents | 83790457e85b |
children |
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. |