Code

Merge branch 'js/configurable-tab' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:28 +0000 (12:25 -0800)
* js/configurable-tab:
  Make the tab width used for whitespace checks configurable

1  2 
Documentation/config.txt
cache.h
t/t4019-diff-wserror.sh

Simple merge
diff --cc cache.h
Simple merge
Simple merge