1975
1956
raise errors.BzrError("bzrlib.merge.merge_inner requires a this_tree "
1977
1958
merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1978
1959
pb=pb, change_reporter=change_reporter)
1979
1960
merger.backup_files = backup_files