From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Feb 2018 22:56:00 +0000 (-0800)
Subject: Merge branch 'nd/list-merge-strategy' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a75d04a67532d21f43261716b4671b7095fa7535

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

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

a75d04a67532d21f43261716b4671b7095fa7535