From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:21:40 +0000 (-0700)
Subject: Merge branch 'ah/unpack-trees-advice-messages' into maint
X-Git-Tag: v2.9.3~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e69771c3afb1c5c05bd3348cc59f0654e1cbcf05?ds=inline;hp=-c

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

Grammofix.

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

e69771c3afb1c5c05bd3348cc59f0654e1cbcf05
diff --combined t/t1011-read-tree-sparse-checkout.sh
index 2563d18440,1d8d751696..81e85e08d9
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@@ -15,11 -15,11 +15,11 @@@ test_description='sparse checkout test
  . "$TEST_DIRECTORY"/lib-read-tree.sh
  
  test_expect_success 'setup' '
 -	cat >expected <<-\EOF &&
 +	cat >expected <<-EOF &&
  	100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0	init.t
 -	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	sub/added
 -	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	sub/addedtoo
 -	100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	subsub/added
 +	100644 $EMPTY_BLOB 0	sub/added
 +	100644 $EMPTY_BLOB 0	sub/addedtoo
 +	100644 $EMPTY_BLOB 0	subsub/added
  	EOF
  	cat >expected.swt <<-\EOF &&
  	H init.t
@@@ -244,7 -244,7 +244,7 @@@ 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