Merge branch 'maint'

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 1c21d8c986fba2c287ffab0b883b65a14cb5401f..f3cd3dba4df6ac1582956a1f9d17a9818aeb694d 100644 (file)
--- 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" \