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 | |
| 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>
| -rw-r--r-- | advice.c | 2 | ||||
| -rwxr-xr-x | contrib/examples/git-pull.sh | 2 |
2 files changed, 2 insertions, 2 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.")); } diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh index 0917d0d056..3539dc91a3 100755 --- 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). -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 |