diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2015-10-01 22:25:33 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-02 14:29:56 -0700 |
| commit | b7447679e84ed973430ab19fce87f56857b83068 (patch) | |
| tree | a3fd433151c2e7115ea1f8cb1e56351f98e8cee4 /advice.c | |
| parent | b1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (diff) | |
| download | git-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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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.")); } |