summaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-19 16:06:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-19 16:06:41 -0800
commit2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40 (patch)
tree3753154d3da34ff50e82a667a75ad56437d4d12f /t/t6033-merge-crlf.sh
parentMerge branch 'ew/keepalive' (diff)
parenti18n: add infrastructure for translating Git with gettext (diff)
downloadtgif-2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40.tar.xz
Merge branch 'ab/enable-i18n'
* ab/enable-i18n: i18n: add infrastructure for translating Git with gettext Conflicts: Makefile
Diffstat (limited to 't/t6033-merge-crlf.sh')
0 files changed, 0 insertions, 0 deletions