← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Martin Pool
  • Date: 2005-07-05 07:24:16 UTC
  • Revision ID: mbp@sourcefrog.net-20050705072416-b2d1237f813f0820
quote

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
 
18
# mbp: "you know that thing where cvs gives you conflict markers?"
 
19
# s: "i hate that."
 
20
 
 
21
 
18
22
 
19
23
def intersect(ra, rb):
20
24
    """Given two ranges return the range where they intersect or None.