Merge branch 'jk/renamelimit' (early part)

* 'jk/renamelimit' (early part): diff: make "too many files" rename warning optional bump rename limit defaults add merge.renamelimit config option