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 (10:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2013 18:04:26 +0000 (10:04 -0800)
commit6f0c33666300ccf95eb4b4e723e07a3c588d12db
treea70a955112a0fbaa9aac9956a2521259ee4f7b0c
parent28db11169b53695827b180e4ee11c33bf2ec116a
parentb141a47801d6fb2d68ec48adfe7597ec3ce49c0d
Merge branch 'ef/non-ascii-parse-options-error-diag' into maint

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