Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maint

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 2f70433568e3134b09d7e1eb10cc5c8995c1a106..460d8ebf48f9ab3826e58e2e9285f6faecd79b78 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
 
 test_debug 'git log --graph --decorate --oneline --all'
 
-test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
+test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '
        git reset --hard c1 &&
        test_must_fail git merge --squash --ff-only c2
 '