/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Martin Pool
  • Date: 2005-07-18 10:21:56 UTC
  • Revision ID: mbp@sourcefrog.net-20050718102156-43412609dc86cbba
- log weave for merge tests to help debugging
- remove test that depends too much on the implementation of delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py