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 --combined t/t1011-read-tree-sparse-checkout.sh
index 3583105698d334ada7c7983c81ea7df74eaa3bde,1d8d751696b05f5bd2ce3472063213804dc16447..e5fa235d3a988bee620479e40574ad54c403f33a
--- 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 --combined t/t7607-merge-overwrite.sh
index e8ec54c134d92c17315a29661069eb9a7a921ba6,1c5934994648642c6fafd20dcc288772c6585e4c..9444d6a9b9026748028178c4b66ee8bbbc1d89fa
--- 1/t/t7607-merge-overwrite.sh
--- 2/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@@ -115,7 -115,7 +115,7 @@@ cat >expect <<\EO
  error: The following untracked working tree files would be overwritten by merge:
        sub
        sub2
- Please move or remove them before you can merge.
+ Please move or remove them before you merge.
  Aborting
  EOF
  
@@@ -125,7 -125,7 +125,7 @@@ test_expect_success 'will not overwrit
        cp important sub &&
        cp important sub2 &&
        test_must_fail git merge sub 2>out &&
 -      test_cmp out expect &&
 +      test_i18ncmp out expect &&
        test_path_is_missing .git/MERGE_HEAD &&
        test_cmp important sub &&
        test_cmp important sub2 &&