← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Hid raw conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
311
311
        else:
312
312
            kwargs['show_base'] = self.show_base
313
313
        merge = self.merge_type(**kwargs)
314
 
        return len(merge.conflicts)
 
314
        return len(merge.cooked_conflicts)
315
315
 
316
316
    def regen_inventory(self, new_entries):
317
317
        old_entries = self.this_tree.read_working_inventory()