Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Oct 19 12:28:12 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Oct 19 13:03:39 2013 +0200
@@ -53,11 +53,11 @@
         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()))
                 )
             )