~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-16 16:27:58 UTC
  • mto: This revision was merged to the branch mainline in revision 1938.
  • Revision ID: john@arbash-meinel.com-20060816162758-752ad5818bc063c9
Move out the blackbox testament tests into a real blackbox module

Show diffs side-by-side

added added

removed removed

Lines of Context: