/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 bzrlib/tests/test_annotate.py

merge trailing whitespace removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
502
502
    def test_reannotate(self):
503
503
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
504
504
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
505
 
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2, 
 
505
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
506
506
                           'blahblah')
507
507
 
508
508
    def test_reannotate_no_parents(self):