Mercurial > hgbook

view en/examples/results/tour-merge-conflict.merge.out @ 662:44d1363234d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move example output files into examples/results
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:37:47 -0700
parents en/examples/tour-merge-conflict.merge.out@bc14f94e726a
children 0d5935744f87
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.