summaryrefslogtreecommitdiff
path: root/sha1dc_git.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-02-13 13:39:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-13 13:39:15 -0800
commit8df7f755569135140bd99bbf57aa354bcc5ac9be (patch)
treee09172a6ee6d5cefc860aa461b79523c5e2a1149 /sha1dc_git.c
parentMerge branch 'jt/long-running-process-doc' (diff)
parentcompletion: fix completing merge strategies on non-C locales (diff)
downloadtgif-8df7f755569135140bd99bbf57aa354bcc5ac9be.tar.xz
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 'sha1dc_git.c')
0 files changed, 0 insertions, 0 deletions