summaryrefslogtreecommitdiff
path: root/t/t6411-merge-filemode.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6411-merge-filemode.sh')
-rwxr-xr-xt/t6411-merge-filemode.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6411-merge-filemode.sh b/t/t6411-merge-filemode.sh
index f54c915d6a..6ae2489286 100755
--- a/t/t6411-merge-filemode.sh
+++ b/t/t6411-merge-filemode.sh
@@ -51,10 +51,10 @@ test_expect_success 'set up mode change in both branches' '
: >file2 &&
git add file2 &&
git commit -m b2 &&
- {
- echo "100755 $H 2 file2"
- echo "100644 $H 3 file2"
- } >expect
+ cat >expect <<-EOF
+ 100755 $H 2 file2
+ 100644 $H 3 file2
+ EOF
'
do_both_modes () {