No more renames option. rename-threshold enables renames. detect_rename is now a simple boolean. Its value is no longer linked to DIFF_ANYTHING symbol.
A second optional patch is included, teaching merge-recursive to take "find-renames[=<n>]" as well, for consistency. Felipe Gonçalves Assis (2): merge-recursive: option to disable renames merge-recursive: more consistent interface Documentation/merge-strategies.txt | 14 ++++++++++++-- merge-recursive.c | 12 +++++++++++- merge-recursive.h | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) -- 2.7.1.288.gfad33a8 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
