diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-14 00:39:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 00:39:15 +0300 |
| commit | 8df7f755569135140bd99bbf57aa354bcc5ac9be (patch) | |
| tree | e09172a6ee6d5cefc860aa461b79523c5e2a1149 /ci | |
| parent | 417c04c5a926d6c7b2dff22a460ec6dc49147df5 (diff) | |
| parent | 7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3 (diff) | |
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
Diffstat (limited to 'ci')
0 files changed, 0 insertions, 0 deletions