Re: [PATCH v5 0/3] merge-recursive: option to disable renames

Yikes, your previous round is already in 'next', so could you make
this series an incremental on top of what is already queued up to
1b47ad16 (merge-recursive: more consistent interface, 2016-02-17)?

Thanks.