Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sat Feb 01 17:16:45 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sat Feb 01 17:47:46 2014 +0100
@@ -48,6 +48,8 @@
             self.__plugin.getPreferences("CleanupPatterns"))
         self.backupCheckBox.setChecked(
             self.__plugin.getPreferences("CreateBackup"))
+        self.internalMergeCheckBox.setChecked(
+            self.__plugin.getPreferences("InternalMerge"))
     
     def save(self):
         """
@@ -67,6 +69,8 @@
             "CleanupPatterns", self.cleanupPatternEdit.text())
         self.__plugin.setPreferences(
             "CreateBackup", self.backupCheckBox.isChecked())
+        self.__plugin.setPreferences(
+            "InternalMerge", self.internalMergeCheckBox.isChecked())
     
     @pyqtSlot()
     def on_configButton_clicked(self):