~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5851.1.1.

  • Committer: Andrew Bennetts
  • Date: 2011-05-13 06:34:55 UTC
  • mto: This revision was merged to the branch mainline in revision 5856.
  • Revision ID: andrew.bennetts@canonical.com-20110513063455-m3j8i0i9bchu7sv1
Fix 'not_applicable' return in ChangeLogMerger.merge_text.  Also add more tests and fix another bug they reveal.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: