/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_textmerge.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_textmerge.py
35
35
        self.assertEqualDiff(''.join(mlines), expected)
36
36
 
37
37
    def test_reprocess(self):
38
 
        struct = [('a', 'b'), ('c',), ('def','geh'), ('i',)]
 
38
        struct = [('a', 'b'), ('c',), ('def', 'geh'), ('i',)]
39
39
        expect = [('a', 'b'), ('c',), ('d', 'g'), ('e',), ('f', 'h'), ('i',)]
40
40
        result = Merge2.reprocess_struct(struct)
41
41
        self.assertEqual(list(result), expect)