/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: Jelmer Vernooij
  • Date: 2011-04-06 14:00:46 UTC
  • mfrom: (727 trunk)
  • mto: This revision was merged to the branch mainline in revision 731.
  • Revision ID: jelmer@samba.org-20110406140046-xa42a1ce8a5bgq7p
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
28
28
import bzrlib.errors as errors
29
29
 
30
30
from bzrlib.plugins.gtk import _i18n, icon_path
31
 
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
31
from bzrlib.plugins.gtk.dialog import (
 
32
    error_dialog,
 
33
    info_dialog,
 
34
    warning_dialog,
 
35
    )
32
36
from bzrlib.plugins.gtk.errors import show_bzr_error
33
37
 
34
38