From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2016 18:24:11 +0000 (-0700)
Subject: Merge branch 'ah/unpack-trees-advice-messages'
X-Git-Tag: v2.10.0-rc0~129
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/67166a8da6283fa519fb257fa222b968fa70db50?hp=-c

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

Grammofix.

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

67166a8da6283fa519fb257fa222b968fa70db50
diff --combined t/t1011-read-tree-sparse-checkout.sh
index 3583105698,1d8d751696..e5fa235d3a
--- a/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 e8ec54c134,1c59349946..9444d6a9b9
--- a/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 &&