--- a/Plugins/PluginVcsMercurial.py Sat Feb 01 17:16:45 2014 +0100 +++ b/Plugins/PluginVcsMercurial.py Sat Feb 01 17:47:46 2014 +0100 @@ -166,6 +166,7 @@ "ServerStyle": "", "CleanupPatterns": "*.orig *.rej *~", "CreateBackup": False, + "InternalMerge": False, } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper