Viewing all changes in revision 822.
- Committer: Martin Pool
- Date: 2005-07-05 07:19:12 UTC
- Revision ID: mbp@sourcefrog.net-20050705071911-6a116ea7c5379658
- Renamed merge3 test suite for easier access.
- New merge approach based on finding triple-matching regions, and comparing
the regions between them; add find_sync_regions() and some tests for it.
- New merge approach based on finding triple-matching regions, and comparing
the regions between them; add find_sync_regions() and some tests for it.
- files renamed:
- bzrlib/selftest/merge3.py => bzrlib/selftest/testmerge3.py
- files modified:
- bzrlib/merge3.py
expand all
collapse all
added
removed
