← 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: 2006-04-05 04:29:35 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405042935-7a86762d00a3ae2e
Got all tests passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
749
749
            else:
750
750
                this_path = "<deleted>"
751
751
            file_id = self.tt.final_file_id(trans_id)
752
 
            c = Conflict.factory(conflict_type, path=this_path,
 
752
            c = Conflict.factory('path conflict', path=this_path,
753
753
                                 conflict_path=other_path, file_id=file_id)
754
754
            self.cooked_conflicts.append(c)
755
755