/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/tests/test_commit_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
21
21
    check,
22
22
    osutils,
23
23
    )
24
 
from ..errors import PointlessCommit
 
24
from ..commit import PointlessCommit
25
25
from . import (
26
26
    TestCaseWithTransport,
27
27
    )