Rev 578: Remove reference to Olive, since Merge dialog is also used by nautilus-bzr and from the command-line. in file:///data/jelmer/bzr-gtk/mergetitle/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/mergetitle/

------------------------------------------------------------
revno: 578
revision-id: jelmer at samba.org-20080725222809-ozrs13d59ndv28n8
parent: jelmer at samba.org-20080725222354-6d8ws46ttf51ydz6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mergetitle
timestamp: Sat 2008-07-26 00:28:09 +0200
message:
  Remove reference to Olive, since Merge dialog is also used by nautilus-bzr and from the command-line.
modified:
  merge.py                       merge.py-20061009195451-45vs0pe2nphnckxh-1
=== modified file 'merge.py'
--- a/merge.py	2008-07-25 15:42:45 +0000
+++ b/merge.py	2008-07-25 22:28:09 +0000
@@ -37,7 +37,7 @@
     
     def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
         """ Initialize the Merge dialog. """
-        gtk.Dialog.__init__(self, title="Olive - Merge",
+        gtk.Dialog.__init__(self, title="Merge changes",
                                   parent=parent,
                                   flags=0,
                                   buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))