~bzr-pqm/bzr/bzr.dev

Committer: Martin Pool
Date: 2005-07-05 08:09:30 UTC
Revision ID: mbp@sourcefrog.net-20050705080929-f44361a66a8b2e29

- Merge3.find_sync_regions always returns a zero-length sentinal at the end to
ease matching.

- Merge3.merge partially done.

added added

removed removed