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)
commit8df7f755569135140bd99bbf57aa354bcc5ac9be
treee09172a6ee6d5cefc860aa461b79523c5e2a1149
parent417c04c5a926d6c7b2dff22a460ec6dc49147df5
parent7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3
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