hgbook
view en/examples/tour-merge-conflict.merge.out @ 558:8631da51309b
Slow progress on XML conversion
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Feb 09 23:25:40 2009 -0800 (2009-02-09) |
| parents | 83790457e85b |
| children |
line source
1 $ \textbf{export HGMERGE=merge}
2 $ \textbf{echo 'XXX this is broken and must be fixed'}
3 XXX this is broken and must be fixed
4 $ \textbf{hg merge}
5 merging letter.txt
6 merge: warning: conflicts during merge
7 merging letter.txt failed!
8 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
9 use 'hg resolve' to retry unresolved file merges
10 $ \textbf{cat letter.txt}
11 Greetings!
13 I am Shehu Musa Abacha, cousin to the former
14 =======
15 I am Alhaji Abba Abacha, son of the former
17 Nigerian dictator Sani Abacha.