← 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 at utoronto
  • Date: 2005-08-26 06:34:07 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050826063406-84d09e206c6c5e73
Shortened conflict markers to 7 characters, to please smerge

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.diff import compare_trees
 
35
    from bzrlib.delta import compare_trees
36
36
 
37
37
    if to_file == None:
38
38
        to_file = sys.stdout