From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Mar 2018 21:24:11 +0000 (-0700)
Subject: Merge branch 'nd/list-merge-strategy' into maint
X-Git-Tag: v2.16.3~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=091853a1aad7e337ac24a55c466820db41ad1026;p=thirdparty%2Fgit.git

Merge branch 'nd/list-merge-strategy' into maint

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

091853a1aad7e337ac24a55c466820db41ad1026