![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Oct 2009 00:33:15 +0000 (17:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Oct 2009 00:33:15 +0000 (17:33 -0700) | ||
| commit | 3694209ca16c033fb4c539cc23b0b370e48952dd | |
| tree | fdabce5e6ed086ae3de8e1adda98eb7efafeeba8 | tree | snapshot |
| parent | 8e850a4dbdcda5e7be8367d81fef3f70da0e8294 | commit | diff |
| parent | 975457f185acd7c1f96ccff67cd5dc8dcb7908a0 | commit | diff |
Merge branch 'maint'
* maint:
Document `delta` attribute in "git help attributes".
Mark files in t/t5100 as UTF-8
Remove a left-over file from t/t5100
* maint:
Document `delta` attribute in "git help attributes".
Mark files in t/t5100 as UTF-8
Remove a left-over file from t/t5100