]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 04:29:21 +0000 (21:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 04:29:21 +0000 (21:29 -0700)
* maint:
  add missing && to submodule-merge testcase
  test-date: fix sscanf type conversion


Trivial merge