Andrew's git / gitweb.git / diff
?
Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Dec 2010 22:42:00 +0000 (14:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Dec 2010 22:42:00 +0000 (14:42 -0800)
* js/maint-apply-tab-in-indent-fix:
apply --whitespace=fix: fix tab-in-indent

1  2 
t/t4124-apply-ws-rule.sh patch | diff1 | diff2 | blob | history
ws.c patch | diff1 | diff2 | blob | history
diff --cc t/t4124-apply-ws-rule.sh
Simple merge
diff --cc ws.c
Simple merge