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

2016-02-16 Thread Felipe Gonçalves Assis
On 16 February 2016 at 23:37, Eric Sunshine wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > wrote: >> No more renames option. rename-threshold enables renames. > > Can you add some tests? Off the top of my head, I'd expect to

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

2016-02-16 Thread Eric Sunshine
On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis 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

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

2016-02-16 Thread Felipe Gonçalves Assis
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[=]" as well, for consistency. Felipe Gonçalves Assis (2):