~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5158.5.1.

  • Committer: Andrew Bennetts
  • Date: 2010-04-19 05:41:54 UTC
  • mto: This revision was merged to the branch mainline in revision 5181.
  • Revision ID: andrew.bennetts@canonical.com-20100419054154-k5pq9dlm977cwpal
Allow Merge3 to work with objects, not just lists of strs.  This removes a lot of cruft from news_merge.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: