mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'sb/unpack-trees-grammofix'
* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories
This commit is contained in:
commit
0f30315ba1
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue