diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:11 -0700 |
| commit | 091853a1aad7e337ac24a55c466820db41ad1026 (patch) | |
| tree | d32cd7828411b771f3c16cfa01add96beede05a1 /commit.c | |
| parent | Merge branch 'jk/daemon-fixes' into maint (diff) | |
| parent | completion: fix completing merge strategies on non-C locales (diff) | |
| download | git-091853a1aad7e337ac24a55c466820db41ad1026.tar.gz git-091853a1aad7e337ac24a55c466820db41ad1026.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions