Merge branch 'nd/list-merge-strategy'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:15 +0000 (13:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2018 21:39:15 +0000 (13:39 -0800)
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


Trivial merge