mercurial/ancestor.py
changeset 48875 6000f5b25c9b
parent 46819 d4ba4d51f85f
child 48946 642e31cb55f0
equal deleted inserted replaced
48874:af0b21d5a930 48875:6000f5b25c9b
     3 # Copyright 2006 Olivia Mackall <olivia@selenic.com>
     3 # Copyright 2006 Olivia Mackall <olivia@selenic.com>
     4 #
     4 #
     5 # This software may be used and distributed according to the terms of the
     5 # This software may be used and distributed according to the terms of the
     6 # GNU General Public License version 2 or any later version.
     6 # GNU General Public License version 2 or any later version.
     7 
     7 
     8 from __future__ import absolute_import
       
     9 
     8 
    10 import heapq
     9 import heapq
    11 
    10 
    12 from .node import nullrev
    11 from .node import nullrev
    13 from . import (
    12 from . import (