← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

differentiated between this tree(input) and working tree(output) in merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
351
351
                                                self.this_branch)
352
352
 
353
353
    def do_merge(self):
354
 
        merge = Merge3Merger(self.this_tree, self.base_tree, self.other_tree)
 
354
        merge = Merge3Merger(self.this_tree, self.this_tree, self.base_tree,
 
355
                             self.other_tree)
355
356
        return len(merge.conflicts)
356
357
 
357
358
    def regen_inventory(self, new_entries):