Plugins/PluginVcsMercurial.py

changeset 3256
1a43351889d5
parent 3250
ed3410e53909
child 3269
866c3a2f5380
--- 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

eric ide

mercurial