git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f936c9b 7cc763a)
Merge branch 'nd/list-merge-strategy' into maint
authorJunio C Hamano <redacted>
Thu, 22 Mar 2018 21:24:11 +0000 (14:24 -0700)
committerJunio C Hamano <redacted>
Thu, 22 Mar 2018 21:24:11 +0000 (14:24 -0700)
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


Trivial merge
git clone https://git.99rst.org/PROJECT