/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: Andrew Bennetts
  • Date: 2011-07-12 23:32:24 UTC
  • mto: (6015.3.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6027.
  • Revision ID: andrew.bennetts@canonical.com-20110712233224-sb298q4qqk344xtx
Backport lp:bzr r6018: Add a 'flush' action to BranchBuilder.build_snapshot.

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: