← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patch.py

  • Committer: Aaron Bentley
  • Date: 2006-04-16 17:49:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060416174914-99d5dec4eafbb923
Whitespace fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patch.py
18
18
from bzrlib.patch import diff3
19
19
from bzrlib.tests import TestCaseInTempDir
20
20
 
 
21
 
21
22
class TestPatch(TestCaseInTempDir):
 
23
 
22
24
    def test_diff3_binaries(self):
23
25
        file('this', 'wb').write('a')
24
26
        file('other', 'wb').write('a')
25
27
        file('base', 'wb').write('\x00')
26
28
        self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')
27
 
 
28