~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2010-01-05 02:13:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4938.
  • Revision ID: nmb@wartburg.edu-20100105021302-lqr16qpar3f38hpf
from review comments: improve splitting, add test that handler is present, use build_tree in tests

Show diffs side-by-side

added added

removed removed

Lines of Context: