diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-14 14:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-14 14:30:21 -0700 |
| commit | 1311587d96e0bff17a34dc9bb9ad27c3abdacdbc (patch) | |
| tree | 9d777b0fd6679d92d38d2aa3d09da25b96486bd6 | |
| parent | c35acb632c70ef0fdc8b741350094907f1938e88 (diff) | |
| parent | b7447679e84ed973430ab19fce87f56857b83068 (diff) | |
| download | git-1311587d96e0bff17a34dc9bb9ad27c3abdacdbc.tar.gz git-1311587d96e0bff17a34dc9bb9ad27c3abdacdbc.tar.xz | |
Merge branch 'pt/pull-builtin'
* pt/pull-builtin:
merge: grammofix in please-commit-before-merge message
| -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 e8dc2e0e7..6b3a03f9b 100755 --- a/contrib/examples/git-pull.sh +++ b/contrib/examples/git-pull.sh @@ -69,7 +69,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 |