/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/plugins/news_merge/news_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
from __future__ import absolute_import
20
20
 
21
21
 
22
 
from bzrlib.plugins.news_merge.parser import simple_parse_lines
23
 
from bzrlib import merge, merge3
 
22
from .parser import simple_parse_lines
 
23
from ... import merge, merge3
24
24
 
25
25
 
26
26
class NewsMerger(merge.ConfigurableFileMerger):