Merge branch 'js/configurable-tab' into next
commit32573659bd6b6ba2f1f70dbd54d4540920c7ff51
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (8 12:25 -0800)
tree1b465fe3e7c0cdad436efd633f37c95fabd44653
parent02aedd58606779b10594c8a6f78cf08f4954877e
parentf4b05a4947f5f1cf3e01fb61ec5919cc28fe11f7
Merge branch 'js/configurable-tab' into next

* js/configurable-tab:
  Make the tab width used for whitespace checks configurable
Documentation/config.txt
cache.h
t/t4019-diff-wserror.sh