← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-02-14 21:40:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070214214053-8n2v072t516l832t
Changes from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
400
400
            finally:
401
401
                child_pb.finished()
402
402
            if change_reporter is not None:
403
 
                import delta
 
403
                from bzrlib import delta
404
404
                delta.report_changes(self.tt._iter_changes(), change_reporter)
405
405
            self.cook_conflicts(fs_conflicts)
406
406
            for conflict in self.cooked_conflicts: