hgbook
annotate en/examples/tour-merge-conflict.merge.out @ 279:3c14c304d823
Ignore more junk.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Dec 11 09:31:58 2007 -0800 (2007-12-11) |
| parents | |
| children | e281bd9a8e47 |
| 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 |
| bos@144 | 7 There are unresolved merges, you can redo the full merge using: |
| bos@144 | 8 hg update -C 1 |
| bos@144 | 9 hg merge 2 |
| 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. |