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: http://git.osdn.net/view?a=commitdiff_plain;h=67166a8da6283fa519fb257fa222b968fa70db50;p=git-core%2Fgit.git

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 --cc t/t1011-read-tree-sparse-checkout.sh
index 358310569,1d8d75169..e5fa235d3
--- 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' '