/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/__init__.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-03 05:21:20 UTC
  • mfrom: (7296.7.7 lca-merge-git)
  • Revision ID: breezy.the.bot@gmail.com-20190603052120-r3t30n2v8qgpmvmz
Avoid using inventories in breezy.merge when encountering lcas.

Merged from https://code.launchpad.net/~jelmer/brz/lca-merge-git/+merge/367321

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/__init__.py
4148
4148
        'breezy.tests.test_missing',
4149
4149
        'breezy.tests.test_msgeditor',
4150
4150
        'breezy.tests.test_multiparent',
 
4151
        'breezy.tests.test_multiwalker',
4151
4152
        'breezy.tests.test_mutabletree',
4152
4153
        'breezy.tests.test_nonascii',
4153
4154
        'breezy.tests.test_options',