← 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: Canonical.com Patch Queue Manager
  • Date: 2007-06-12 17:28:39 UTC
  • mfrom: (1551.15.22 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
Fix botched merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py