hgbook
annotate en/examples/tour-merge-conflict.merge.out @ 554:91adcea08b33
Fix the bisect section, I hope (bisect is now part of Mercurial).
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Wed Jan 21 14:16:38 2009 +0100 (2009-01-21) |
| parents | 006bbad1f190 |
| children | 83790457e85b |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{export HGMERGE=merge} |
| bos@144 | 2 $ \textbf{hg merge} |
| bos@144 | 3 merging letter.txt |
| bos@144 | 4 merge: warning: conflicts during merge |
| bos@144 | 5 merging letter.txt failed! |
| bos@144 | 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| hg@302 | 7 use 'hg resolve' to retry unresolved file merges |
| bos@144 | 8 $ \textbf{cat letter.txt} |
| bos@144 | 9 Greetings! |
| bos@144 | 10 |
| bos@144 | 11 I am Shehu Musa Abacha, cousin to the former |
| bos@144 | 12 ======= |
| bos@144 | 13 I am Alhaji Abba Abacha, son of the former |
| bos@144 | 14 |
| bos@144 | 15 Nigerian dictator Sani Abacha. |