From 584f99c87bf92d403a95527483f6e48d1722c3f0 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 2 Dec 2016 11:17:41 -0800 Subject: unpack-trees: fix grammar for untracked files in directories Noticed-by: David Turner Signed-off-by: Stefan Beller Reviewed-by: David Turner Signed-off-by: Junio C Hamano --- t/t7609-merge-co-error-msgs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index 6729cb379..85cd971f2 100755 --- a/t/t7609-merge-co-error-msgs.sh +++ b/t/t7609-merge-co-error-msgs.sh @@ -105,7 +105,7 @@ test_expect_success 'not uptodate file porcelain checkout error' ' ' cat >expect <<\EOF -error: Updating the following directories would lose untracked files in it: +error: Updating the following directories would lose untracked files in them: rep rep2 -- cgit v1.2.1