Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -55,14 +55,14 @@
         Private method used to enable/disable the OK-button.
         """
         self.okButton.setDisabled(
-            self.tag1Combo.currentText() != "" or \
-            self.tag2Combo.currentText() != "" or \
-            not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and \
-                  self.rx_url.exactMatch(self.tag2Combo.currentText())) or \
-                 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and \
+            self.tag1Combo.currentText() != "" or
+            self.tag2Combo.currentText() != "" or
+            not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and
+                  self.rx_url.exactMatch(self.tag2Combo.currentText())) or
+                 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and
                   self.rx_rev.exactMatch(self.tag2Combo.currentText()))
-                )
-            )
+                 )
+        )
         
     def on_tag1Combo_editTextChanged(self, text):
         """