summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-12-21 14:27:55 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-21 13:26:32 -0800
commit77e572653b5089c9e3639fe4088f59e4cfef4eea (patch)
tree57a8456ae8c0ec4a7e77ee0057c2a3208feb922a /t/t6037-merge-ours-theirs.sh
parentt3419-*.sh: Fix arithmetic expansion syntax error (diff)
downloadtgif-77e572653b5089c9e3639fe4088f59e4cfef4eea.tar.xz
t0050: fix printf format strings for portability
Unlike bash and ksh, dash passes through hexadecimal \xcc escapes. So when run with dash, these tests *pass* (since '\xcc' is a perfectly reasonable filename) but they are not testing what was intended. Use octal escapes instead, in the spirit of v1.6.1-rc1~55^2 (2008-11-09). Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions