/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/changelog_merge/tests/test_changelog_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:
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from bzrlib import (
 
17
from breezy import (
18
18
    merge,
19
19
    tests,
20
20
    )
21
 
from bzrlib.tests import test_merge_core
22
 
from bzrlib.plugins.changelog_merge import changelog_merge
 
21
from breezy.tests import test_merge_core
 
22
from breezy.plugins.changelog_merge import changelog_merge
23
23
 
24
24
 
25
25
sample_base_entries = [