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>
Alex Henrie committed
Oct 1, 2015 at 22:25 UTC
b7447679e84ed973430ab19fce87f56857b83068
2 files changed
+2
-2
advice.c
+1
-1
@@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)
100
{
101
error(_("You have not concluded your merge (MERGE_HEAD exists)."));
102
if (advice_resolve_conflict)
103
- advise(_("Please, commit your changes before you can merge."));
103
+ advise(_("Please, commit your changes before merging."));
104
die(_("Exiting because of unfinished merge."));
105
}
106
contrib/examples/git-pull.sh
+1
-1
@@ -29,7 +29,7 @@ as appropriate to mark resolution and make a commit.")"
29
die_merge () {
30
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
31
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
32
-Please, commit your changes before you can merge.")"
32
+Please, commit your changes before merging.")"
33
else
34
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
35
fi