← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-08-25 09:17:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050825091719-b2d7be7bf56bb35a
- fix a few errors in new merge code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
30
30
from bzrlib.delta import compare_trees
31
31
from bzrlib.trace import mutter, warning
32
32
from bzrlib.fetch import greedy_fetch
33
 
 
 
33
from bzrlib.revision import is_ancestor
34
34
 
35
35
# comments from abentley on irc: merge happens in two stages, each
36
36
# of which generates a changeset object