← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Martin Pool
  • Date: 2005-06-28 14:54:59 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050628145459-5c29c7b0377a199b
Add Weave.merge_iter to get automerged lines

Add AutoMerge test case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py