Merge branch 'jc/parseopt-verify-short-name'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:38 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:38 +0000 (11:38 -0700)
Add checks for a common programming mistake to assign the same
short option name to two separate options to help developers.

* jc/parseopt-verify-short-name:
parse-options: detect attempt to add a duplicate short option name

1  2 
parse-options.c
diff --cc parse-options.c
Simple merge