← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

  • Committer: Aaron Bentley
  • Date: 2006-05-25 22:01:44 UTC
  • mto: This revision was merged to the branch mainline in revision 1732.
  • Revision ID: aaron.bentley@utoronto.ca-20060525220144-aad0dd7452ed8f9d
Use patience for two-way merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
18
18
#         Aaron Bentley <aaron.bentley@utoronto.ca>
19
19
 
20
20
 
21
 
from difflib import SequenceMatcher
 
21
from bzrlib.patiencediff import SequenceMatcher
22
22
 
23
23
 
24
24
class TextMerge(object):