← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
20
20
 
21
21
 
22
22
from bzrlib.errors import CantReprocessAndShowBase
23
 
from bzrlib.patiencediff import SequenceMatcher
 
23
from bzrlib.patiencediff import PatienceSequenceMatcher
24
24
from bzrlib.textfile import check_text_lines
25
25
 
 
26
SequenceMatcher = PatienceSequenceMatcher
 
27
 
 
28
 
26
29
def intersect(ra, rb):
27
30
    """Given two ranges return the range where they intersect or None.
28
31