Andrew's git / gitweb.git / diff
?
Merge branch 'nd/parseopt-completion' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2018 18:34:40 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2018 18:34:41 +0000 (11:34 -0700)
Hotfix for recently graduated topic that give help to completion
scripts from the Git subcommands that are being completed

* nd/parseopt-completion:
t9902: disable test on the list of merge-strategies under GETTEXT_POISON

Trivial merge