/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugins/changelog_merge/changelog_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-27 12:31:04 UTC
  • mto: This revision was merged to the branch mainline in revision 6447.
  • Revision ID: jelmer@samba.org-20120127123104-y45cfh3hma4w23gq
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/changelog_merge.py
20
20
 
21
21
import difflib
22
22
 
23
 
from bzrlib import debug, merge, urlutils
 
23
from bzrlib import (
 
24
    debug,
 
25
    merge,
 
26
    urlutils,
 
27
    )
24
28
from bzrlib.merge3 import Merge3
25
29
from bzrlib.trace import mutter
26
30