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

On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis
[off-list ref] wrote:

No more renames option. rename-threshold enables renames.

Can you add some tests? Off the top of my head, I'd expect to see at
least three new tests:

1. --no-renames works as expected
2. last wins in "--no-renames --rename-threshold=x"
3. last wins in "--rename-threshold=x --no-renames"

A second optional patch is included, teaching merge-recursive to take
"find-renames[=<n>]" as well, for consistency.

Tests should also accompany this change. A couple obvious ones:

1. --find-rename=x works as synonym for --rename-threshold=x
2. --fine-rename (without "=x") works as expected

Thanks.

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