← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Aaron Bentley
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
32
32
        If set, write to this file (default stdout.)
33
33
    """
34
34
    import sys
35
 
    from bzrlib.delta import compare_trees
 
35
    from bzrlib.diff import compare_trees
36
36
 
37
37
    if to_file == None:
38
38
        to_file = sys.stdout