i'm getting this error and I do not know why:
% hg commit
abort: cannot commit merge with missing files
hg status
does not show any missing files.
I just spent several hours resolving all my merge conflicts, and now it won't let me commit them. What do I do?