On 30 August 2018 21:41:35 GMT+05:30, Elijah Newren <newren@xxxxxxxxx> wrote: >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". FWIW, this sounds better to me than the original. -- Sivaraam Sent from my Android device with K-9 Mail. Please excuse my brevity.
