summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorJason Riedy <ejr@EECS.Berkeley.EDU>2007-01-16 01:31:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-16 06:23:21 (GMT)
commit2aad957a519b354e248da8c76ee0d3997083dde6 (patch)
tree258b4f061def13b863c31d06e3a30114de413e1a /t/t6023-merge-file.sh
parentfb9522062c89da61f5ccbaa1d063e0754463176f (diff)
downloadgit-2aad957a519b354e248da8c76ee0d3997083dde6.zip
git-2aad957a519b354e248da8c76ee0d3997083dde6.tar.gz
git-2aad957a519b354e248da8c76ee0d3997083dde6.tar.bz2
Replace "echo -n" with printf in shell scripts.
Not all echos know -n. This was causing a test failure in t5401-update-hooks.sh, but not t3800-mktag.sh for some reason. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6023-merge-file.sh')
-rw-r--r--t/t6023-merge-file.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 1c21d8c..f3cd3db 100644
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -52,7 +52,7 @@ super aquam refectionis educavit me;
animam meam convertit,
deduxit me super semitas jusitiae,
EOF
-echo -n "propter nomen suum." >> new4.txt
+printf "propter nomen suum." >> new4.txt
cp new1.txt test.txt
test_expect_success "merge without conflict" \