Merge branch 'sb/submodule-config-parse'

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)
-               advise(_("Please, commit your changes before you can merge."));
+               advise(_("Please, commit your changes before merging."));
        die(_("Exiting because of unfinished merge."));
 }