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>

diff --git a/advice.c b/advice.c
index 4965686e19cbb44b86d48363f8f3e289bebef94d..4dc5cf10a8533b1bfc3bd1483e91df115aa8f868 100644 (file)
--- 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)
 {
        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."));
 }
 
        die(_("Exiting because of unfinished merge."));
 }
 

diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index 0917d0d056573912df60afd7b556efe04eeebae8..3539dc91a3331dc2c1dfb3d915168d16e051ee61 100755 (executable)
--- 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).
 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
     else
        die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
     fi