Mercurial > hgbook

view en/examples/tour-merge-conflict.merge.out @ 648:bc14f94e726a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in a known-broken example to fix up later - XXX
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 29 Jan 2009 22:47:34 -0800
parents 83790457e85b
children
line wrap: on
line source

$ \textbf{export HGMERGE=merge}
$ \textbf{echo 'XXX this is broken and must be fixed'}
XXX this is broken and must be fixed
$ \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.