mercurial/copies.py
changeset 8312 b87a50b7125c
parent 8225 46293a0c7e9f
child 8337 0e73e21d81ff
equal deleted inserted replaced
8311:e0eb03bfa5af 8312:b87a50b7125c
     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, incorporated herein by reference.
     6 # GNU General Public License version 2, incorporated herein by reference.
     7 
     7 
     8 from i18n import _
     8 from i18n import _
     9 import util, heapq
     9 import util
       
    10 import heapq
    10 
    11 
    11 def _nonoverlap(d1, d2, d3):
    12 def _nonoverlap(d1, d2, d3):
    12     "Return list of elements in d1 not in d2 or d3"
    13     "Return list of elements in d1 not in d2 or d3"
    13     return sorted([d for d in d1 if d not in d3 and d not in d2])
    14     return sorted([d for d in d1 if d not in d3 and d not in d2])
    14 
    15