$ cat > letter.txt <<EOF > Greetings! > I am Bryan O'Sullivan, no relation of the former > Nigerian dictator Sani Abacha. > EOF $ hg resolve -m letter.txt $ hg commit -m 'Send me your money' $ hg tip changeset: tag: tip parent: parent: user: Bryan O'Sullivan <bos@serpentine.com> summary: Send me your money