/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/patiencediff.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-20 15:15:53 UTC
  • mfrom: (5905 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5952.
  • Revision ID: jelmer@samba.org-20110520151553-os9yowwk0klrslku
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patiencediff.py
73
73
     four
74
74
    """
75
75
    if sequencematcher is None:
76
 
        import difflib
77
76
        sequencematcher = difflib.SequenceMatcher
78
77
 
79
78
    if fromfiledate: