diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 23:19:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 23:19:05 (GMT) |
| commit | 1addc197eb41a8fbcd6968c4ee245b65a68c2be6 (patch) | |
| tree | e4e6aa6f934db61bec3eebd12ce1b302954d1847 | |
| parent | 13236160c3ce46b84c4605a04a877ef7a407b539 (diff) | |
| parent | 584f99c87bf92d403a95527483f6e48d1722c3f0 (diff) | |
| download | git-1addc197eb41a8fbcd6968c4ee245b65a68c2be6.zip git-1addc197eb41a8fbcd6968c4ee245b65a68c2be6.tar.gz git-1addc197eb41a8fbcd6968c4ee245b65a68c2be6.tar.bz2 | |
Merge branch 'sb/unpack-trees-grammofix' into maint
* sb/unpack-trees-grammofix:
unpack-trees: fix grammar for untracked files in directories
| -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 f80bdb8..e904132 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 ea6bdd2..7a6df99 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 |