Merge branch 'en/merge-recursive'

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 95b180f4693658504fa44d8199efc2a31e85b43d..ae2194e07d835aa088a1c5b5f5fa5001f41ea7d5 100755 (executable)
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -53,7 +53,7 @@ test_expect_success 'set up buggy branch' '
      echo "line 12" >> hello &&
      echo "line 13" >> hello &&
      add_and_commit_file hello "2 more lines" &&
-     HASH6=$(git rev-parse --verify HEAD)
+     HASH6=$(git rev-parse --verify HEAD) &&
      echo "line 14" >> hello &&
      echo "line 15" >> hello &&
      echo "line 16" >> hello &&