summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-08-08 14:26:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-08 14:26:10 -0700
commitc2a8c3701b25929b6df2a999b3e8d1a19ee55fc0 (patch)
treeea4c04b1df0d3c92075a3f6161099a847a57c6cc /merge-recursive.c
parentMerge branch 'en/disable-dir-rename-in-recursive-merge' (diff)
parentl10n: reformat some localized strings for v2.23.0 (diff)
downloadtgif-c2a8c3701b25929b6df2a999b3e8d1a19ee55fc0.tar.xz
Merge branch 'ja/l10n-fixes'
A few messages have been updated to help localization better. * ja/l10n-fixes: l10n: reformat some localized strings for v2.23.0
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions