~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matt Nordhoff
  • Date: 2009-06-23 22:31:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4479.
  • Revision ID: mnordhoff@mattnordhoff.com-20090623223159-fqfgl9c7a4umtafj
bzrlib.util.bencode's deprecation warning used the wrong stacklevel

Show diffs side-by-side

added added

removed removed

Lines of Context: