~frankoid/bzr-transplant/bzr25-fix

Viewing all changes in revision 19.

  • Committer: Francis Devereux
  • Date: 2012-05-04 12:39:14 UTC
  • Revision ID: francis@devrx.org-20120504123914-re88rhfuz850horb
Fix compatibility with bzr 2.5

Avoid the use of Merger.check_basis(), which was removed in bzr 2.5.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: