Skip to content

Commit 1addc19

Browse files
committed
Merge branch 'sb/unpack-trees-grammofix' into maint
* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories
2 parents 1323616 + 584f99c commit 1addc19

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

t/t7609-merge-co-error-msgs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ test_expect_success 'not uptodate file porcelain checkout error' '
105105
'
106106

107107
cat >expect <<\EOF
108-
error: Updating the following directories would lose untracked files in it:
108+
error: Updating the following directories would lose untracked files in them:
109109
rep
110110
rep2
111111

unpack-trees.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
7878
xstrfmt(msg, cmd, cmd);
7979

8080
msgs[ERROR_NOT_UPTODATE_DIR] =
81-
_("Updating the following directories would lose untracked files in it:\n%s");
81+
_("Updating the following directories would lose untracked files in them:\n%s");
8282

8383
if (!strcmp(cmd, "checkout"))
8484
msg = advice_commit_before_merge

0 commit comments

Comments
 (0)