Mercurial Repositories > eric / file diff

diff -r 5dafcc891579 -r 6084bb3c3911 Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Wed Mar 12 19:54:14 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Thu Mar 13 19:21:25 2014 +0100
@@ -39,6 +39,9 @@
         else:
             self.bookmarkButton.setHidden(True)
             self.bookmarkCombo.setHidden(True)
+        
+        msh = self.minimumSizeHint()
+        self.resize(max(self.width(), msh.width()), msh.height())
     
     def __updateOK(self):
         """