← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patiencediff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-17 05:57:15 UTC
  • mfrom: (5036.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100217055715-5b8xt6dfbov0bbgz
(mbp) merge 2.1 back to trunk

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
76
77
        sequencematcher = difflib.SequenceMatcher
77
78
 
78
79
    if fromfiledate: