Rev 548: Merge fix for regression in merge. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 548
revision-id: jelmer at samba.org-20080718110607-v8800mc2q0w7ilj0
parent: jelmer at samba.org-20080718104142-jowo24tkk0z646z3
parent: colbrac at xs4all.nl-20080718110053-2kj16tnszo5nmyvi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 13:06:07 +0200
message:
  Merge fix for regression in merge.
modified:
  olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
    ------------------------------------------------------------
    revno: 533.2.3
    revision-id: colbrac at xs4all.nl-20080718110053-2kj16tnszo5nmyvi
    parent: colbrac at xs4all.nl-20080717231543-0hbkqs4emdi88bj1
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: mergedialog
    timestamp: Fri 2008-07-18 13:00:53 +0200
    message:
      MergeDialog: Point to right location again.
    modified:
      olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-07-18 10:38:13 +0000
+++ b/olive/__init__.py	2008-07-18 11:06:07 +0000
@@ -547,7 +547,7 @@
     
     def on_menuitem_branch_merge_activate(self, widget):
         """ Branch/Merge... menu handler. """
-        from bzrlib.plugins.gtk.olive.merge import MergeDialog
+        from bzrlib.plugins.gtk.merge import MergeDialog
         
         if self.check_for_changes():
             error_dialog(_i18n('There are local changes in the branch'),