Make merge-recursive honor diff.renamelimit