On Mon, Dec 4, 2017 at 1:46 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > * en/rename-directory-detection (2017-11-21) 33 commits <snip> > Rename detection logic in "diff" family that is used in "merge" has > learned to guess when all of x/a, x/b and x/c have moved to z/a, > z/b and z/c, it is likely that x/d added in the meantime would also > want to move to z/d by taking the hint that the entire directory > 'x' moved to 'z'. It appears that you're still using V3 of my directory rename detection series; I got some feedback from Stefan and Johannes on that series (including compilation failures on Windows) and believe I have addressed all of it in V4, which can be found here: https://public-inbox.org/git/20171129014237.32570-1-newren@xxxxxxxxx/
