[bug] git `next' does not do trivial merges · Paolo Bonzini <hidden> · 2016-06-15
Re: [bug] git `next' does not do trivial merges · Jeff King <hidden> · 2016-06-15
Re: [bug] git `next' does not do trivial merges · Miklos Vajna <hidden> · 2016-06-15
[PATCH] Fix in-index merge. · Miklos Vajna <hidden> · 2016-06-15
[PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH] Fix in-index merge. · Paolo Bonzini <hidden> · 2016-06-15

Re: [bug] git `next' does not do trivial merges

From: Jeff King <hidden>
Date: 2016-06-15 22:45:12

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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help