From: Geoff Russell <geoffrey.russell@gmail.com>
Date: Sat, 03 Jun 2006 06:48:32 GMT
Subject: A test failing with python 2.2 -- ok?
Message-ID: <93c3eada0606022348l3c39f966u781327b14b0bc3d5@mail.gmail.com>

Hi,

I'm not sure how far back you are supporting, but I'm running a python
2.2 machine
and make test fails with a missing python module. Whatever criss-cross merges
are, I don't need them, but figured if you were intending to support older
environments, then you may be interested.

Cheers,
Geoff Russell

$ git --version

    git version 1.3.3.g61ef-dirty

$ make test

*** t6021-merge-criss-cross.sh ***
....

Traceback (most recent call last):
  File "/usr/local/LINUX/GIT/git/t/../git-merge-recursive", line 10, in ?
    from heapq import heappush, heappop
ImportError: No module named heapq
-------------------------------------------------------