From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2007 02:14:47 GMT
Subject: Re: [PATCH] Fix read-tree merging more than 3 trees using 3-way merge
Message-ID: <7vbqd6j4a0.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LFD.0.999.0708161750550.30176@woody.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> Sorry. I didn't even realize people did this. Oops.

This is no big deal.  It would have triggered if you are using
resolve strategy _and_ did a multi merge-base merge, the former
of which is quite unusual these days.

> What *is* the behaviour for four trees? Reading "unpack_trees()" source 
> implies that all other trees go into stage 1, where the first matching 
> entry is used?

Documentation/technical/trivial-merge.txt describes this under
three-way case.  Essentially this was an attempt to extend the
original merge-resolve so that it would catch problematic
criss-cross cases (case #16 in the description).