Kevin Ballard <kevin@xxxxxx> writes: > The recursive merge strategy turns on rename detection but leaves the > rename score at the default. Add a strategy option to allow the user > to specify a rename score to use. Sounds straightforward, except that Documentation/diff-options.txt seems to call the number associated with -M "threshold", not "score". The title of the patch incidentally says threshold as well ;-) At the end-user level, this new option to merge-recursive has exactly the same meaning as existing -M given to "diff" family; people would probably want to see it made available as a synonym to "diff" family as well, no? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html