summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2015-10-01 22:25:33 -0600
committerJunio C Hamano <gitster@pobox.com>2015-10-02 14:29:56 -0700
commitb7447679e84ed973430ab19fce87f56857b83068 (patch)
treea3fd433151c2e7115ea1f8cb1e56351f98e8cee4 /advice.c
parentb1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (diff)
downloadgit-b7447679e84ed973430ab19fce87f56857b83068.tar.gz
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>
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c2
1 files changed, 1 insertions, 1 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."));
}