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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_mergetools.py
100
100
        self._exe = None
101
101
        self._args = None
102
102
        self.build_tree_contents((
103
 
            ('test.txt', b'stuff'),
104
 
            ('test.txt.BASE', b'base stuff'),
105
 
            ('test.txt.THIS', b'this stuff'),
106
 
            ('test.txt.OTHER', b'other stuff'),
 
103
            ('test.txt', 'stuff'),
 
104
            ('test.txt.BASE', 'base stuff'),
 
105
            ('test.txt.THIS', 'this stuff'),
 
106
            ('test.txt.OTHER', 'other stuff'),
107
107
        ))
108
108
 
109
109
    def test_invoke_expands_exe_path(self):