Elijah Newren <newren@xxxxxxxxx> writes: >> Suggestions for a better rewrite is very much appreciated. > > That makes sense. I'm not sure I can concisely convey all the right > points, but here's a stab at rewording: > > Recent addition of "directory rename" heuristics to the > merge-recursive backend makes the command susceptible to false > positives and false negatives. In the context of "git am -3", which > does not know about surrounding unmodified paths and thus cannot > inform the merge machinery about the full trees involved, this risk is > particularly severe. As such, the heuristic is disabled for "git am > -3" to keep the machinery "more stupid but predictable". Excellent. Let me use that when merging it to 'next'.
