Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/list-merge-strategy'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Feb 2018 21:39:15 +0000
(13:39 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Feb 2018 21:39:15 +0000
(13:39 -0800)
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
raw
|
combined
(merge:
417c04c
7cc763a
)
Trivial merge