← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-22 18:24:25 UTC
  • mfrom: (1803 +trunk)
  • mto: (1793.3.6 bundle-fixes)
  • mto: This revision was merged to the branch mainline in revision 1806.
  • Revision ID: john@arbash-meinel.com-20060622182425-6f45cb7acd587216
[merge] bzr.dev 1804 and fix conflicts.

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