From: Junio C Hamano Date: Tue, 12 Jul 2016 21:27:16 GMT Subject: Re: [PATCH v3 00/16] Use merge_recursive() directly in the builtin am Message-ID: In-Reply-To: Johannes Schindelin writes: > This is the second iteration of the long-awaited re-roll of the attempt to > avoid spawning merge-recursive from the builtin am and use merge_recursive() > directly instead. This is actually the third iteration. I am trying to tease dependencies apart and apply this on a more reasonable base than a commit that happened to be at 'pu' on one day, but this would probably take some time, and I may give up merging it anywhere for today's integration cycle. We'll see.