Merge branch 'ef/non-ascii-parse-options-error-diag' into next
commit10cbdf8e3fde11a02a457f6830551648c1fd2dad
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 19:16:30 +0000 (14 11:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 19:16:30 +0000 (14 11:16 -0800)
treed7cf5126cb9890f49048ad12647a148e86e264dd
parent5fb47ceea9521d0a63eb247ee1a341d7c10796b0
parentb141a47801d6fb2d68ec48adfe7597ec3ce49c0d
Merge branch 'ef/non-ascii-parse-options-error-diag' into next

* ef/non-ascii-parse-options-error-diag:
  parse-options: report uncorrupted multi-byte options
parse-options.c