Merge branch 'js/configurable-tab'

* js/configurable-tab:
  Make the tab width used for whitespace checks configurable
  apply --whitespace=fix: fix tab-in-indent

diff --cc Documentation/config.txt
Simple merge

diff --cc cache.h
Simple merge

diff --cc t/t4019-diff-wserror.sh
Simple merge