← 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

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
282
282
        orig_progress = os.environ.get('BZR_PROGRESS_BAR')
283
283
        try:
284
284
            os.environ['BZR_PROGRESS_BAR'] = 'none'
285
 
            out, err = self.run_bzr_subprocess('diff', '-r', '1',
286
 
                                               '--diff-options', '-ub',
 
285
            out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
287
286
                                               universal_newlines=True,
288
287
                                               retcode=None)
289
288
        finally: