~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Andrew Bennetts
  • Date: 2011-05-19 09:32:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5896.
  • Revision ID: andrew.bennetts@canonical.com-20110519093238-nwmz5fkehlu37hag
Move docstring formatting fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.
902
902
        """Factory for producing a DiffTree.
903
903
 
904
904
        Designed to accept options used by show_diff_trees.
 
905
 
905
906
        :param old_tree: The tree to show as old in the comparison
906
907
        :param new_tree: The tree to show as new in the comparison
907
908
        :param to_file: File to write comparisons to