tree 196dcd66914dca5b4a8329a7d54b599680a7074c
parent d2b11eca7eccc4dfc22a8fc1182d9341458dd9cb
author Felipe Gonçalves Assis <felipeg.assis@gmail.com> 1455678926 -0200
committer Junio C Hamano <gitster@pobox.com> 1455733252 -0800

merge-recursive: more consistent interface

Add strategy option find-renames, following git-diff interface. This
makes the option rename-threshold redundant.

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>