summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--advice.c2
-rwxr-xr-xcontrib/examples/git-pull.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index 4965686e19..4dc5cf10a8 100644
--- a/advice.c
+++ b/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."));
}
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index 0917d0d056..3539dc91a3 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -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