Merge branch 'jc/fmt-req-fix'
commitd98a20114d641789e1c886f6c26e63d91132f5da
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 03:19:21 +0000 (30 20:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 03:19:21 +0000 (30 20:19 -0700)
treeecedf83d9a56ff47e1a44030faa705aa90078ed4
parent1f9a980636d39c08c1cf1c13a6e6584d9d039e0e
parenta6253d107734c7ffa6d939307d87cf496795dc78
Merge branch 'jc/fmt-req-fix'

* jc/fmt-req-fix:
  userformat_find_requirements(): find requirement for the correct format
pretty.c