← 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-04-19 02:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060419021605-7f28e84382ceef4d
Apply merge review suggestions

Show diffs side-by-side

added added

removed removed

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