/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 breezy/plugins/changelog_merge/changelog_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
import difflib
22
22
 
23
 
from bzrlib import (
 
23
from breezy import (
24
24
    debug,
25
25
    merge,
26
26
    urlutils,
27
27
    )
28
 
from bzrlib.merge3 import Merge3
29
 
from bzrlib.trace import mutter
 
28
from breezy.merge3 import Merge3
 
29
from breezy.trace import mutter
30
30
 
31
31
 
32
32
def changelog_entries(lines):