From: Johannes Schindelin Date: Mon, 14 Jul 2008 09:30:24 GMT Subject: Re: [PATCH] Fix reduce_heads Message-ID: In-Reply-To: <402c10cd0807132107s29c470f7hb834bd5c00ef399e@mail.gmail.com> Hi, On Sun, 13 Jul 2008, Sverre Hvammen Johansen wrote: > Reduce_heads used by build in merge failed to find the correct > heads in cases where duplicate heads are specified. I liked Junio's explanation better. > This should fix the last breakage I found. ([PATCH/Test] Build in > merge is broken) > I have squashed in Miklos's fix and the two tests cases to protect this. I'd rather not have it squashed in. Miklos is a GSoC student, and at the end I want to show the shortlog to tell Google how he fared. Unfortunately, Miklos is on holiday this week, so he cannot send a mail of his own. Junio, could you fake a commit message with a sign-off for Miklos, or do you want me to do it? Ciao, Dscho