Re: merge-recur status

Johannes Schindelin [off-list ref] writes:

I tried to wrap my head over it, but seem unable to do so. Also, I do not 
find the case 14ALT (which is mentioned in unpack-trees.c:603) in 
Documentation/technical/trivial-merge.txt.

That is t/t1000-read-tree-m-3way.sh case 14.  The current
semantics for case 14 used to be called ALT until 3e03aaf
simplified the table to reflect the reality, because the
"alternative" semantics had been in use for quite some time
already back then.

I'd like to take a look at 41094b8e, the real trouble that is
causing you grief, sometime later, but I'm currently pondering
if the one I tag should be called 1.4.2 or 1.4.2-rc4 ;-).