Mercurial Repositories > eric / file diff

diff -r 8bfa66a9138a -r 866c3a2f5380 Plugins/PluginVcsMercurial.py
--- a/Plugins/PluginVcsMercurial.py	Sun Feb 09 16:01:19 2014 +0100
+++ b/Plugins/PluginVcsMercurial.py	Sun Feb 09 16:01:42 2014 +0100
@@ -211,7 +211,7 @@
         @return the requested setting
         """
         if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate",
-                   "PreferUnbundle", "CreateBackup"]:
+                   "PreferUnbundle", "CreateBackup", "InternalMerge"]:
             return Preferences.toBool(Preferences.Prefs.settings.value(
                 "Mercurial/" + key, self.__mercurialDefaults[key]))
         elif key in ["LogLimit", "CommitMessages", "ServerPort"]: