Merge branch 'ah/unpack-trees-advice-messages'

Grammofix.

* ah/unpack-trees-advice-messages:
  unpack-trees: fix English grammar in do-this-before-that messages

diff --cc t/t1011-read-tree-sparse-checkout.sh
index 3583105,1d8d751..e5fa235
--- 1/t/t1011-read-tree-sparse-checkout.sh
--- 2/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@@ -244,10 -244,10 +244,10 @@@ test_expect_success 'print errors when 
  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_cmp expected actual
 +      test_i18ncmp expected actual
  '
  
  test_expect_success 'checkout without --ignore-skip-worktree-bits' '

diff --cc t/t7607-merge-overwrite.sh
Simple merge