Merge branch 'jc/fmt-req-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 03:19:21 +0000 (20:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 03:19:21 +0000 (20:19 -0700)
* jc/fmt-req-fix:
  userformat_find_requirements(): find requirement for the correct format

1  2 
pretty.c

diff --cc pretty.c
Simple merge