Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Oct 2009 00:33:15 +0000 (17:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Oct 2009 00:33:15 +0000 (17:33 -0700)
* maint:
Document `delta` attribute in "git help attributes".
Mark files in t/t5100 as UTF-8
Remove a left-over file from t/t5100

Trivial merge