diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:32 -0700 |
| commit | c7997e54a5dd75803657b25aea101255f388ac08 (patch) | |
| tree | 2dc49a343351b57281ba5f1b06f6fe3133ef3610 /contrib | |
| parent | 22f698cb188243b313e024d618283e0293e37140 (diff) | |
| parent | e7a7401f8ba22995708fb015b7c75f45256e05bf (diff) | |
| download | git-c7997e54a5dd75803657b25aea101255f388ac08.tar.gz | |
Merge branch 'pt/pull-builtin' into maint
* pt/pull-builtin:
pull: enclose <options> in brackets in the usage string
merge: grammofix in please-commit-before-merge message
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/examples/git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh index e8dc2e0e7d..6b3a03f9b0 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 |