Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

merge-recursive: include heapq?

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:11

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help