[PATCH] unpack-trees: fix grammar for untracked files in directories

[Stefan Beller]

Noticed-by: David Turner <dtur...@twosigma.com>
Signed-off-by: Stefan Beller <sbel...@google.com>
---

This was noticed by David when reviewing the submodule checkout series,
though rolling this as an independent fix is better :)

Thanks,
Stefan

 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 f80bdb81e1..e90413204e 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 ea6bdd20e0..7a6df99d10 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
-- 
2.10.2.613.g22f2156