/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/blackbox/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_conflicts.py
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 brzlib import (
 
17
from breezy import (
18
18
    conflicts,
19
19
    tests,
20
20
    workingtree,
21
21
    )
22
 
from brzlib.tests import script, features
 
22
from breezy.tests import script, features
23
23
 
24
24
 
25
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',