| commit | 091853a1aad7e337ac24a55c466820db41ad1026 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Mar 2018 21:24:11 +0000 (22 14:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Mar 2018 21:24:11 +0000 (22 14:24 -0700) | ||
| tree | d32cd7828411b771f3c16cfa01add96beede05a1 | treesnapshot (tar.gz zip) |
| parent | f936c9b39339983a3cc270803fb9bc0d621da553 | commitdiff |
| parent | 7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3 | commitdiff |
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
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