summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Torsten Bögershausen <tboegi@web.de>2013-04-12 23:18:20 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 14:58:08 -0700
commit924f6c3d3931ea782b0f9abee7b8012fe8e5e0fb (patch)
tree4f17a611e11f912715d66fc17e40b6025a801f27 /merge-recursive.c
parentSync with 'maint' (diff)
downloadtgif-924f6c3d3931ea782b0f9abee7b8012fe8e5e0fb.tar.xz
test-bzr: portable shell and utf-8 strings for Mac OS
Make the shell script more portable: - Split export X=Y into 2 lines - Use printf instead of echo -e Use UTF-8 code points which are not decomposed by the filesystem: Code points like "á" will be decomposed by Mac OS X. bzr is unable to find the file "á" on disk. Use code points from unicode which can not be decomposed. In other words, the precompsed form use the same bytes as decomposed. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Acked-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions