~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5540.4.4.

  • Committer: Andrew Bennetts
  • Date: 2010-11-18 00:43:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5546.
  • Revision ID: andrew.bennetts@canonical.com-20101118004357-f2r2zhmahtp7lcob
Make the tests more relaxed about the return type of merge_to (don't assume lists)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: