[PATCH v3 0/2] merge-recursive: option to disable renames

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(-)