From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 11 Nov 2005 14:23:04 GMT
Subject: merge-recursive: include heapq?
Message-ID: <Pine.LNX.4.63.0511111520260.7575@wbgn013.biozentrum.uni-wuerzburg.de>

Hi,

I get this when pulling:

-- snip --
Traceback (most recent call last):
  File "./git-merge-recursive", line 4, in ?
    from heapq import heappush, heappop
ImportError: No module named heapq
-- snap --

Okay, my python is *old*:

$ python -V
Python 2.2.1

Is it worthwhile to include heapq as we did with subprocess? Or should I 
upgrade...

Ciao,
Dscho