diff -r 5dafcc891579 -r 6084bb3c3911 Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Wed Mar 12 19:54:14 2014 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Thu Mar 13 19:21:25 2014 +0100
@@ -48,6 +48,9 @@
self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
self.okButton.setEnabled(False)
+ msh = self.minimumSizeHint()
+ self.resize(max(self.width(), msh.width()), msh.height())
+
def __enableOkButton(self):
"""
Private method used to enable/disable the OK-button.
