diff -r 96232974dcdb -r 645c12de6b0c Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui Sun Mar 30 22:00:14 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui Thu Apr 03 23:05:31 2014 +0200
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>372</width>
- <height>249</height>
+ <height>305</height>
</rect>
</property>
<property name="windowTitle">
@@ -44,9 +44,6 @@
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
- <property name="minimum">
- <number>1</number>
- </property>
<property name="maximum">
<number>999999999</number>
</property>
