/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Aaron Bentley
  • Date: 2006-06-23 15:27:25 UTC
  • mfrom: (1806 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1807.
  • Revision ID: abentley@panoramicfeedback.com-20060623152725-61519496365d39fc
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
27
27
import bzrlib.osutils
28
28
from bzrlib.patiencediff import unified_diff
29
29
import bzrlib.patiencediff
30
 
from bzrlib.symbol_versioning import *
 
30
from bzrlib.symbol_versioning import (deprecated_function,
 
31
        zero_eight)
31
32
from bzrlib.textfile import check_text_lines
32
33
from bzrlib.trace import mutter, warning
33
34