bos@144: $ \textbf{export HGMERGE=merge}
bos@144: $ \textbf{hg merge}
bos@144: merging letter.txt
bos@144: merge: warning: conflicts during merge
bos@144: merging letter.txt failed!
bos@144: 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
bos@144: There are unresolved merges, you can redo the full merge using:
bos@144:   hg update -C 1
bos@144:   hg merge 2
bos@144: $ \textbf{cat letter.txt}
bos@144: Greetings!
bos@144: 
bos@144: I am Shehu Musa Abacha, cousin to the former
bos@144: =======
bos@144: I am Alhaji Abba Abacha, son of the former
bos@144: 
bos@144: Nigerian dictator Sani Abacha.