Merge branch 'jk/merge-rename-ux'

* jk/merge-rename-ux:
  pull: propagate --progress to merge
  merge: enable progress reporting for rename detection
  add inexact rename detection progress infrastructure
  commit: stop setting rename limit
  bump rename limit defaults (again)
  merge: improve inexact rename limit warning

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc diffcore-rename.c
Simple merge

diff --cc git-pull.sh
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc merge-recursive.h
Simple merge