← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-11-28 07:16:39 UTC
  • mfrom: (3871.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20081128071639-usprv2emoq2mgxnw
(mbp) merge back 1.10rc1 and start 1.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py