mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 01:46:08 +02:00
Code

merge: grammofix in please-commit-before-merge message 

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alex Henrie 2015-10-01 22:25:33 -06:00 committed by Junio C Hamano
parent b1456605c2
commit b7447679e8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advice.c
View File

@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)
{
error(_("You have not concluded your merge (MERGE_HEAD exists)."));
if (advice_resolve_conflict)
advise(_("Please, commit your changes before you can merge."));
advise(_("Please, commit your changes before merging."));
die(_("Exiting because of unfinished merge."));
}

2
contrib/examples/git-pull.sh
View File

@ -29,7 +29,7 @@ as appropriate to mark resolution and make a commit.")"
die_merge () {
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.")"
Please, commit your changes before merging.")"
else
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
fi