/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 brzlib/tests/blackbox/test_remerge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 11:25:18 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521112518-5x3xa7t4hnjk8kb8
Rename bzrlib => brzlib, bzr => brz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/blackbox/test_remerge.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib.tests import TestCaseWithTransport
21
 
from bzrlib.workingtree import WorkingTree
 
20
from brzlib.tests import TestCaseWithTransport
 
21
from brzlib.workingtree import WorkingTree
22
22
 
23
23
 
24
24
class TestRemerge(TestCaseWithTransport):