Viewing all changes in revision 0.1.65.

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

added added

removed removed