From: Jeff King <peff@peff.net>
Date: Fri, 22 Aug 2008 19:31:17 GMT
Subject: Re: [bug] git `next' does not do trivial merges
Message-ID: <20080822193117.GA6361@coredump.intra.peff.net>
In-Reply-To: <g8lmpn$jvk$1@ger.gmane.org>

On Fri, Aug 22, 2008 at 08:36:39AM +0200, Paolo Bonzini wrote:

> I had already posted this bug report yesterday but it was hidden in a  
> cover letter at  
> http://permalink.gmane.org/gmane.comp.version-control.git/93143 -- so  
> I'll copy the relevant info here:

Sadly, this bisects to 1c7b76b (Build in merge).

-Peff