Mercurial > hgbook

view en/examples/tour-merge-conflict.merge.out @ 199:58e3a6c76725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 17:37:27 -0700
parents 006bbad1f190
children e281bd9a8e47
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.