Merge branch 'ef/non-ascii-parse-options-error-diag'
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:06:14 +0000 (16:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:06:14 +0000 (16:06 -0800)
commit6bdecc8...56a06f085b4444dc29361a5aa80d9eef
tree5fcc658...b7febaa14560a9a53d0cf50365b43f3dcopy hash to clipboard (tree)
parentbfc1f6a...c18b3b0eba7e9126fb0b2688f865a110copy hash to clipboard (diff)
parentb141a47...01d6fb2d68ec48adfe7597ec3ce49c0dcopy hash to clipboard (diff)
parse-options.c