← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

Merge from mbp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
29
29
 
30
30
    def test_conflicts(self):
31
31
        """Conflicts are detected properly"""
32
 
        b = Branch.initialize('.')
 
32
        b = Branch.initialize(u'.')
33
33
        file('hello', 'w').write('hello world4')
34
34
        file('hello.THIS', 'w').write('hello world2')
35
35
        file('hello.BASE', 'w').write('hello world1')