development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sb/unpack-trees-grammofix'

Browse source 
* sb/unpack-trees-grammofix:
  unpack-trees: fix grammar for untracked files in directories
This commit is contained in:
Junio C Hamano 2016-12-19 14:45:31 -08:00
parent b08c812f99 584f99c87b
commit 0f30315ba1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t7609-merge-co-error-msgs.sh
View file

@ -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

2
unpack-trees.c
View file

@ -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