← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
463
463
    """Show in text form the changes from one tree to another.
464
464
 
465
465
    :param to_file: The output stream.
466
 
    :param specific_files:Include only changes to these files - None for all
 
466
    :param specific_files: Include only changes to these files - None for all
467
467
        changes.
468
468
    :param external_diff_options: If set, use an external GNU diff and pass 
469
469
        these options.
942
942
        """Factory for producing a DiffTree.
943
943
 
944
944
        Designed to accept options used by show_diff_trees.
 
945
 
945
946
        :param old_tree: The tree to show as old in the comparison
946
947
        :param new_tree: The tree to show as new in the comparison
947
948
        :param to_file: File to write comparisons to