From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Sep 2011 15:24:10 GMT
Subject: Re: error: addinfo_cache failed during merge
Message-ID: <7vehz01yhx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <26411548.33530.1317221043429.JavaMail.root@mail.hq.genarts.com>

Stephen Bash <bash@genarts.com> writes:

> ... I should caveat that my local git/git is a little out of date
> because I haven't repointed it since k.org went down (I use it very
> rarely), so there might be something newer in this area.

Indeed there have been a few fixs in this area and it would be really nice
if you can test this with the latest master branch before 1.7.7 final
ships.