493
493
tt = tree_merger.make_preview_transform()
494
494
new_tree = tt.get_preview_tree()
495
495
if self.write_diff_to is None:
497
497
path_encoding = osutils.get_diff_header_encoding()
498
498
diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
499
499
path_encoding=path_encoding)