How to resolve merging conflicts in Mercurial (v1.0.2)?

To highlight an answer in a comment for Hg 1.1+:

For Hg 1.1+ fix the file by hand and then do

hg resolve -m test.h

to mark the file as merged.