summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-20 08:33:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-20 08:33:26 -0700
commit74c6cba6d82a2947c0f80b6343b9ca281ee325b3 (patch)
treec5f551ec84ec562eba3345efef58989ca7f85212 /builtin/merge.c
parentGit 2.27-rc0 (diff)
parentt1509: correct i18n test (diff)
downloadtgif-74c6cba6d82a2947c0f80b6343b9ca281ee325b3.tar.xz
Merge branch 'dd/t1509-i18n-fix'
A few tests were not i18n clean. * dd/t1509-i18n-fix: t1509: correct i18n test
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions