diff -r 96232974dcdb -r 645c12de6b0c Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py --- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun Mar 30 22:00:14 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Thu Apr 03 23:05:31 2014 +0200 @@ -50,6 +50,9 @@ self.targetCombo.clear() self.targetCombo.addItems(targetlist) + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + def __enableOkButton(self): """ Private method used to enable/disable the OK-button.