![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jul 2010 04:29:21 +0000 (21:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Jul 2010 04:29:21 +0000 (21:29 -0700) | ||
| commit | 78db709ae59da26de76264b79df3a7dc4d87e65c | |
| tree | e96f2af98f008112b74b3c7649ff723e8a1160ed | tree | snapshot |
| parent | 5b5275f6e9ca6284ca123f729d5a78f409e448fb | commit | diff |
| parent | 420432d4342e214c15f063a630a883072d4e5779 | commit | diff |
Merge branch 'maint'
* maint:
add missing && to submodule-merge testcase
test-date: fix sscanf type conversion
* maint:
add missing && to submodule-merge testcase
test-date: fix sscanf type conversion