~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 2664.12.1.

  • Committer: Daniel Watkins
  • Date: 2007-08-08 01:53:18 UTC
  • mto: (2738.3.1 fix_blackbox_test_merge)
  • mto: This revision was merged to the branch mainline in revision 2786.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070808015318-zejmehg0a82at5c7
tests.blackbox.test_merge now uses internals where appropriate.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: