← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Aaron Bentley
  • Date: 2006-05-23 01:07:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: aaron.bentley@utoronto.ca-20060523010731-8ffa480f08c46c21
Reoganize patience-related code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
19
19
# s: "i hate that."
20
20
 
21
21
 
22
 
from bzrlib.cdv.cdvdifflib import SequenceMatcher
23
 
#from difflib import SequenceMatcher
24
22
from bzrlib.errors import CantReprocessAndShowBase
 
23
from bzrlib.patiencediff import SequenceMatcher
25
24
from bzrlib.textfile import check_text_lines
26
25
 
27
26
def intersect(ra, rb):