/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/merge.py

  • Committer: Martin Pool
  • Date: 2005-10-05 04:38:09 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051005043809-2a1988bc7c01dbf3
- new Weave.copy()
- factor out calculation of parent indexes in weave.join()
- more Weave.join() tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py