Add new merge functionality to tree views (see r15645)

svn: r15668
2010-07-30 18:13:06 +00:00
parent 0c6b7405c2
commit e1f34d3ebe
3 changed files with 7 additions and 9 deletions
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -117,7 +117,6 @@ UIDEFAULT = '''<ui>
    <placeholder name="CommonEdit"/>
    <separator/>
    <menuitem action="ScratchPad"/>
-    <placeholder name="Merge"/>
    <separator/>
    <menuitem action="Preferences"/>
  </menu>