Merge branch 'js/log-to-diffopt-file'

diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index 3583105698d334ada7c7983c81ea7df74eaa3bde..e5fa235d3a988bee620479e40574ad54c403f33a 100755 (executable)
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update worktree' '
 error: The following untracked working tree files would be overwritten by checkout:
        sub/added
        sub/addedtoo
-Please move or remove them before you can switch branches.
+Please move or remove them before you switch branches.
 Aborting
 EOF
        test_i18ncmp expected actual