/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

  • Committer: Martin Pool
  • Date: 2010-05-27 03:07:30 UTC
  • mfrom: (688.1.5 201956-help)
  • Revision ID: mbp@canonical.com-20100527030730-os0opv1xroetccm9
https://launchpad.net/bugs/201965
Make find/goto more discoverable

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
27
27
from bzrlib.branch import Branch
28
28
import bzrlib.errors as errors
29
29
 
30
 
from bzrlib.plugins.gtk import icon_path
31
 
from bzrlib.plugins.gtk.dialog import (
32
 
    error_dialog,
33
 
    info_dialog,
34
 
    warning_dialog,
35
 
    )
 
30
from bzrlib.plugins.gtk import _i18n, icon_path
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
36
32
from bzrlib.plugins.gtk.errors import show_bzr_error
37
 
from bzrlib.plugins.gtk.i18n import _i18n
38
33
 
39
34
 
40
35
class MergeDialog(gtk.Dialog):