During merges mercurial leaves .orig file for any unresolved file. But after manually resolving problems and marking a file correct it does not delete the .orig file. Can it
you should use the update hook
update: This is run after an update or merge of the working directory has finished