← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_diff.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-01 19:41:16 UTC
  • mfrom: (2158 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061201194116-nvn5qhfxux5284jc
[merge] bzr.dev 2158

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
272
272
            os.environ['BZR_PROGRESS_BAR'] = 'none'
273
273
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
274
274
                                               '--diff-options', '-ub',
 
275
                                               universal_newlines=True,
275
276
                                               retcode=None)
276
277
        finally:
277
278
            if orig_progress is None: