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>
Stefan Beller committed
Dec 2, 2016 at 11:17 UTC
584f99c87bf92d403a95527483f6e48d1722c3f0
2 files changed
+2
-2
t/t7609-merge-co-error-msgs.sh
+1
-1
@@ -105,7 +105,7 @@ test_expect_success 'not uptodate file porcelain checkout error' '
105
'
106
107
cat >expect <<\EOF
108
-error: Updating the following directories would lose untracked files in it:
108
+error: Updating the following directories would lose untracked files in them:
109
rep
110
rep2
111
unpack-trees.c
+1
-1
@@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
78
xstrfmt(msg, cmd, cmd);
79
80
msgs[ERROR_NOT_UPTODATE_DIR] =
81
- _("Updating the following directories would lose untracked files in it:\n%s");
81
+ _("Updating the following directories would lose untracked files in them:\n%s");
82
83
if (!strcmp(cmd, "checkout"))
84
msg = advice_commit_before_merge