← 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: 2005-10-13 21:58:18 UTC
  • mfrom: (1447)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@troll-20051013215818-0900f030e3923901
Fixed symlink reverting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
190
190
        self.create(file_id, stem+".OTHER", self.other_tree)
191
191
        self.create(file_id, stem+".BASE", self.base_tree)
192
192
 
 
193
    def threeway_contents_conflict(filename, this_contents, base_contents,
 
194
                                   other_contents):
 
195
        self.conflict("Three-way conflict merging %s" % filename)
 
196
 
193
197
    def finalize(self):
194
198
        if not self.ignore_zero:
195
199
            note("%d conflicts encountered.\n" % self.conflicts)