From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Mar 2018 18:34:40 +0000 (-0700)
Subject: Merge branch 'nd/parseopt-completion' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bee77135e538f2fb682de42a569a93dbfdedc16

Merge branch 'nd/parseopt-completion' into next

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
---

2bee77135e538f2fb682de42a569a93dbfdedc16