hgbook

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

find changesets by author, revision, files, or words in the commit message
Fixing problem on bisect that inhibits building with mercurial 1.0 or later
author Igor Támara <igor@tamarapatino.org>
date Sat Oct 18 06:02:21 2008 -0500 (2008-10-18)
parents 006bbad1f190
children 83790457e85b
line source
1 $ \textbf{export HGMERGE=merge}
2 $ \textbf{hg merge}
3 merging letter.txt
4 merge: warning: conflicts during merge
5 merging letter.txt failed!
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
7 use 'hg resolve' to retry unresolved file merges
8 $ \textbf{cat letter.txt}
9 Greetings!
10
11 I am Shehu Musa Abacha, cousin to the former
12 =======
13 I am Alhaji Abba Abacha, son of the former
14
15 Nigerian dictator Sani Abacha.