Merge branch 'js/configurable-tab'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)
* js/configurable-tab:
Make the tab width used for whitespace checks configurable
apply --whitespace=fix: fix tab-in-indent

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