diff options
| author | Stefan Beller <sbeller@google.com> | 2016-12-02 11:17:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-05 12:17:02 -0800 |
| commit | 584f99c87bf92d403a95527483f6e48d1722c3f0 (patch) | |
| tree | af95b3cc721da0f090e40828149b47d84cd28672 | |
| parent | 2e3926b9489cb767b38526a3a72403087053a1d8 (diff) | |
| download | git-584f99c87bf92d403a95527483f6e48d1722c3f0.tar.gz | |
unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofix
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>
| -rwxr-xr-x | t/t7609-merge-co-error-msgs.sh | 2 | ||||
| -rw-r--r-- | 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 |