> You might want to configure merge-patterns in your .ini: Well, did I get this right: If I set a merge pattern to interal:fail mercurial won't use a merge tool to update or commit a new version, but instead just overwrite the existing data with the new one. Correct?