← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Patch Queue Manager
  • Date: 2011-12-18 21:24:45 UTC
  • mfrom: (6379.1.1 no-termios)
  • Revision ID: pqm@pqm.ubuntu.com-20111218212445-onsppr7rdov3cw42
(jelmer) Avoid always importing termios and tty in bzrlib.osutils. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py