← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1246
1246
        self.addCleanup(diff_obj.finish)
1247
1247
        self.assertEqual(['diff', '%(old_path)s', '%(new_path)s'],
1248
1248
            diff_obj.command_template)
 
1249
 
 
1250
    def test_from_string_u5(self):
1249
1251
        diff_obj = DiffFromTool.from_string('diff -u\\ 5', None, None, None)
 
1252
        self.addCleanup(diff_obj.finish)
1250
1253
        self.assertEqual(['diff', '-u 5', '%(old_path)s', '%(new_path)s'],
1251
1254
                         diff_obj.command_template)
1252
1255
        self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],