← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin Pool
  • Date: 2005-08-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

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