----- Original Message ----- > From: "Junio C Hamano" <gitster@xxxxxxxxx> > To: "Stephen Bash" <bash@xxxxxxxxxxx> > Cc: "git discussion list" <git@xxxxxxxxxxxxxxx> > Sent: Wednesday, September 28, 2011 11:24:10 AM > Subject: Re: error: addinfo_cache failed during merge > > Stephen Bash <bash@xxxxxxxxxxx> 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. Okay. Will do right now. Thanks, Stephen -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html