--- a/hggtk/merge.py	Sun Jul 20 09:43:33 2008 -0400
+++ b/hggtk/merge.py	Mon Jul 21 11:51:12 2008 -0400
@@ -59,17 +59,10 @@
                 self._btn_unmerge_clicked,
                 tip='Undo merging and return working directory to'
                     ' one of it parent revision')
-        sep = gtk.SeparatorToolItem()
-        sep.set_expand(True)
-        sep.set_draw(False)
-        self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close',
-                self._close_clicked, tip='Close Application')
         tbuttons = [
                 self._btn_merge,
                 gtk.SeparatorToolItem(),
-                self._btn_unmerge,
-                sep,
-                self._btn_close
+                self._btn_unmerge
             ]
         for btn in tbuttons:
             self.tbar.insert(btn, -1)
@@ -113,9 +106,6 @@
         # show them all
         self._refresh()
 
-    def _close_clicked(self, toolbutton, data=None):
-        self.destroy()
-
     def _toolbutton(self, stock, label, handler,
                     menu=None, userdata=None, tip=None):
         if menu: