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

  • Committer: Martin
  • Date: 2017-11-12 13:53:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6810.
  • Revision ID: gzlist@googlemail.com-20171112135351-uyr1ncw7visg62c2
Apply 2to3 ws_comma fixer

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
1061
1061
        # trunk switched. As such it should certainly produce the same
1062
1062
        # conflict.
1063
1063
        self.assertRaises(errors.MalformedTransform,
1064
 
                          self.run_script,"""
 
1064
                          self.run_script, """
1065
1065
$ brz init trunk
1066
1066
...
1067
1067
$ cd trunk