Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the Mercurial plug-in accessing config values.
Sun, 09 Feb 2014 16:01:42 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 09 Feb 2014 16:01:42 +0100
- changeset 3269
- 866c3a2f5380
- parent 3268
- 8bfa66a9138a
- child 3270
- d8532d902e76
Fixed an issue in the Mercurial plug-in accessing config values.
| Plugins/PluginVcsMercurial.py | file | annotate | diff | comparison | revisions |
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"]:
