/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: Bastian Bowe
  • Date: 2011-08-08 12:47:07 UTC
  • mto: (6015.14.1 bzr24-filter-809901)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: bastian.bowe@gmail.com-20110808124707-3jegg252r1d804v0
https://launchpad.net/bugs/809901
Merged fix regarding error in CHKInventory.filter method from mainline

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: