This was confusing to me as well when I first came to hg. +1 on mentioning it 
somewhere more obvious, probably in the message about resolve, eg change that to 
read:
use 'hg resolve' to retry unresolved file merges or 'hg update --clean' to discard 
the merge