aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-12-02 11:17:41 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-05 12:17:02 -0800
commit584f99c87bf92d403a95527483f6e48d1722c3f0 (patch)
treeaf95b3cc721da0f090e40828149b47d84cd28672 /unpack-trees.c
parent2e3926b9489cb767b38526a3a72403087053a1d8 (diff)
downloadgit-584f99c87bf92d403a95527483f6e48d1722c3f0.tar.gz
git-584f99c87bf92d403a95527483f6e48d1722c3f0.tar.xz
unpack-trees: fix grammar for untracked files in directories
Noticed-by: David Turner <dturner@twosigma.com> Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: David Turner <dturner@twosigma.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index aea9aa749..129a3547d 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