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