Commit b7447679 authored by Alex Henrie's avatar Alex Henrie Committed by Junio C Hamano

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

Signed-off-by: Alex Henrie's avatarAlex Henrie <alexhenrie24@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent b1456605
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment