Mercurial > hgbook
comparison en/examples/tour-merge-conflict.merge.out @ 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 06 Mar 2007 21:44:56 -0800 |
| parents | |
| children | e281bd9a8e47 |
comparison
equal
deleted
inserted
replaced
| 143:f2aabd15dd50 | 144:006bbad1f190 |
|---|---|
| 1 $ \textbf{export HGMERGE=merge} | |
| 2 $ \textbf{hg merge} | |
| 3 merging letter.txt | |
| 4 merge: warning: conflicts during merge | |
| 5 merging letter.txt failed! | |
| 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 7 There are unresolved merges, you can redo the full merge using: | |
| 8 hg update -C 1 | |
| 9 hg merge 2 | |
| 10 $ \textbf{cat letter.txt} | |
| 11 Greetings! | |
| 12 | |
| 13 I am Shehu Musa Abacha, cousin to the former | |
| 14 ======= | |
| 15 I am Alhaji Abba Abacha, son of the former | |
| 16 | |
| 17 Nigerian dictator Sani Abacha. |