Mercurial > hgbook

view en/examples/tour-merge-conflict.merge.out @ 431:d13a05515acf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing problem on bisect that inhibits building with mercurial 1.0 or later
author Igor Támara <igor@tamarapatino.org>
date Sat, 18 Oct 2008 06:02:21 -0500
parents e281bd9a8e47
children 83790457e85b
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
use 'hg resolve' to retry unresolved file merges
$ \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.