From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Feb 2018 21:39:15 +0000 (-0800)
Subject: Merge branch 'nd/list-merge-strategy'
X-Git-Tag: v2.17.0-rc0~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8df7f755569135140bd99bbf57aa354bcc5ac9be;p=thirdparty%2Fgit.git

Merge branch 'nd/list-merge-strategy'

Completion of "git merge -s<strategy>" (in contrib/) did not work
well in non-C locale.

* nd/list-merge-strategy:
  completion: fix completing merge strategies on non-C locales
---

8df7f755569135140bd99bbf57aa354bcc5ac9be