/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/plugins/weave_fmt/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/test_workingtree.py
41
41
            url, format=BzrDirFormat6())
42
42
 
43
43
    def test_conflicts(self):
44
 
        # test backwards compatability
 
44
        # test backwards compatibility
45
45
        tree = self.create_format2_tree('.')
46
46
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
47
47
                          None)