Mercurial > hgbook
view en/examples/tour-merge-conflict.merge.out @ 530:f809de31887a
more translation :D
added a term to the glossary
author | jerojasro@localhost |
---|---|
date | Sun, 30 Nov 2008 18:41:51 -0500 |
parents | 83790457e85b |
children | bc14f94e726a |
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.