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 +- unpack-trees.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh index 6729cb379f..85cd971f24 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 diff --git a/unpack-trees.c b/unpack-trees.c index aea9aa749f..129a3547dc 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, xstrfmt(msg, cmd, cmd); msgs[ERROR_NOT_UPTODATE_DIR] = - _("Updating the following directories would lose untracked files in it:\n%s"); + _("Updating the following directories would lose untracked files in them:\n%s"); if (!strcmp(cmd, "checkout")) msg = advice_commit_before_merge -- cgit v1.2.3