зеркало из https://github.com/microsoft/git.git
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:
Родитель
b1456605c2
Коммит
b7447679e8
2
advice.c
2
advice.c
|
@ -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."));
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче