← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-03-09 20:01:41 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070309200141-22zi853yb73m0w8h
Do not show prefixes in diffs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
230
230
        tree_1 = repository.revision_tree(ancestor_id)
231
231
        tree_2 = repository.revision_tree(revision_id)
232
232
        s = StringIO()
233
 
        diff.show_diff_trees(tree_1, tree_2, s)
 
233
        diff.show_diff_trees(tree_1, tree_2, s, old_label='', new_label='')
234
234
        return s.getvalue()
235
235
 
236
236
    @staticmethod