aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-27 00:11:45 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-27 00:11:45 -0800
commiteef32a0653f9b4e90ace46c9f041ff41dbf4e632 (patch)
tree6ffa066e35d25d17d3f657a5e7e793bdfa3dc53f /ll-merge.h
parentad1b4e2c0e5521da39e13088f197b256303a2fc8 (diff)
parentacefe2be287b099886f1240bd1f5adfa66dbadee (diff)
downloadgit-eef32a0653f9b4e90ace46c9f041ff41dbf4e632.tar.gz
git-eef32a0653f9b4e90ace46c9f041ff41dbf4e632.tar.xz
Merge branch 'va/i18n-even-more'
* va/i18n-even-more: i18n: fix misconversion in shell scripts
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions