Mercurial – cannot commit merge with missing files error

Try hg status and look for files in state ! (missing).

The cause is that one of the files which is part of the merge has been deleted. Undelete the file and try again.