Mercurial > hgbook
view ja/examples/tour-merge-conflict.merge.out @ 836:d819bc2414f4
add figs/bad-merge-*.dot.
a part of 7226e5e750a6.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Thu, 23 Jul 2009 18:10:58 +0900 |
| parents | b0db5adf11c1 |
| children |
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 There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2 $ \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.