7147 7001: Merge person dialog does not properly adjust context section after expand

src/Merge/mergeperson.py

@@ -72,7 +72,7 @@ class MergePeople(ManagedWindow.ManagedWindow):
     Displays a dialog box that allows the persons to be combined into one.
     """
     def __init__(self, dbstate, uistate, handle1, handle2, cb_update=None,
-            expand_context_info=False):
+            expand_context_info=True):
         ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
         self.database = dbstate.db
         self.pr1 = self.database.get_person_from_handle(handle1)

src/glade/mergeperson.glade

@@ -5,6 +5,7 @@
   <object class="GtkDialog" id="mergeperson">
     <property name="modal">True</property>
     <property name="default_width">700</property>
+    <property name="default_height">400</property>
     <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">