Commit 091853a1 authored by Junio C Hamano's avatar Junio C Hamano

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
parents f936c9b3 7cc763aa
......@@ -594,7 +594,7 @@ __git_is_configured_remote ()
__git_list_merge_strategies ()
git merge -s help 2>&1 |
LANG=C LC_ALL=C git merge -s help 2>&1 |
sed -n -e '/[Aa]vailable strategies are: /,/^$/{
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment