Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2013 22:49:55 +0000 (9 15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2013 22:49:55 +0000 (9 15:49 -0700)
* maint:
  parse-options: fix clang opterror() -Wunused-value warning

1  2 
parse-options.h

diff --cc parse-options.h
Simple merge