484
484
other_bzrdir = master_branch.bzrdir.sprout('other')
485
485
other_tree = other_bzrdir.open_workingtree()
488
488
# that our commit after merging will have a merged revision in the
490
490
self.build_tree_contents([('other/content_file', 'change in other\n')])