/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/test_conflicts.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1178
1178
        return self.parser.parse_args(args)
1179
1179
 
1180
1180
    def test_unknown_action(self):
1181
 
        self.assertRaises(errors.BadOptionValue,
 
1181
        self.assertRaises(option.BadOptionValue,
1182
1182
                          self.parse, ['--action', 'take-me-to-the-moon'])
1183
1183
 
1184
1184
    def test_done(self):