← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2008-11-11 02:31:57 UTC
  • mto: This revision was merged to the branch mainline in revision 3829.
  • Revision ID: mbp@sourcefrog.net-20081111023157-ylori8pmnbsef6hm
Correct example of branchbuilder and change to a doctest, and refactor

Show diffs side-by-side

added added

removed removed

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