diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:31 -0800 |
| commit | 0f30315ba15f792fac6f901ca486900a74fdb86d (patch) | |
| tree | 53a091b55013af699480c662531c847df5eb52a5 /unpack-trees.c | |
| parent | b08c812f99e8260c7f93966b0ee2b1339120ce29 (diff) | |
| parent | 584f99c87bf92d403a95527483f6e48d1722c3f0 (diff) | |
| download | git-0f30315ba15f792fac6f901ca486900a74fdb86d.tar.gz git-0f30315ba15f792fac6f901ca486900a74fdb86d.tar.xz | |
Merge branch 'sb/unpack-trees-grammofix'
* sb/unpack-trees-grammofix:
unpack-trees: fix grammar for untracked files in directories
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index ea6bdd20e..7a6df99d1 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 |