Merge branch 'ef/non-ascii-parse-options-error-diag' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2013 18:04:26 +0000 (27 10:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2013 18:04:26 +0000 (27 10:04 -0800)
* ef/non-ascii-parse-options-error-diag:
  parse-options: report uncorrupted multi-byte options

1  2 
parse-options.c

diff --cc parse-options.c
Simple merge