Re: [PATCH v3 2/2] merge-recursive: more consistent interface

On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis wrote: > Add strategy option find-renames, following git-diff interface. This > makes the option rename-threshold redundant. Missing sign-off. > --- > diff --git a/Documentation/merge-strategies.txt >

[PATCH v3 2/2] merge-recursive: more consistent interface

Add strategy option find-renames, following git-diff interface. This makes the option rename-threshold redundant. --- A minor note git diff --check complains about an indent with spaces here, but I think I did the right thing: indented with tabs and aligned with spaces. If desired, I can align