Mercurial > hgbook
view en/examples/tour-merge-conflict.merge.out @ 401:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 22:00:46 +0200 |
| parents | 006bbad1f190 |
| children | 83790457e85b |
line wrap: on
line source
$ \textbf{export HGMERGE=merge} $ \textbf{hg merge} merging letter.txt merge: warning: conflicts during merge merging letter.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges $ \textbf{cat letter.txt} Greetings! I am Shehu Musa Abacha, cousin to the former ======= I am Alhaji Abba Abacha, son of the former Nigerian dictator Sani Abacha.