{"thread":{"id":"40471","subject":"[PATCH] merge: Fix English grammar in please-commit-before-merge message.","startedAt":"2015-10-02T04:25:33Z","lastAt":"2015-10-02T04:25:33Z","messageCount":1,"participants":["Alex Henrie"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"270994","messageId":"1443759933-10263-1-git-send-email-alexhenrie24@gmail.com","threadId":"40471","inReplyTo":null,"subject":"[PATCH] merge: Fix English grammar in please-commit-before-merge message.","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2015-10-02T04:25:33Z","receivedAt":"2015-10-02T04:25:33Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n advice.c                     | 2 +-\n contrib/examples/git-pull.sh | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/advice.c b/advice.c\nindex 4965686..4dc5cf1 100644\n--- a/advice.c\n+++ b/advice.c\n@@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)\n {\n \terror(_(\"You have not concluded your merge (MERGE_HEAD exists).\"));\n \tif (advice_resolve_conflict)\n-\t\tadvise(_(\"Please, commit your changes before you can merge.\"));\n+\t\tadvise(_(\"Please, commit your changes before merging.\"));\n \tdie(_(\"Exiting because of unfinished merge.\"));\n }\n \ndiff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh\nindex e8dc2e0..6b3a03f 100755\n--- a/contrib/examples/git-pull.sh\n+++ b/contrib/examples/git-pull.sh\n@@ -69,7 +69,7 @@ as appropriate to mark resolution and make a commit.\")\"\n die_merge () {\n     if [ $(git config --bool --get advice.resolveConflict || echo true) = \"true\" ]; then\n \tdie \"$(gettext \"You have not concluded your merge (MERGE_HEAD exists).\n-Please, commit your changes before you can merge.\")\"\n+Please, commit your changes before merging.\")\"\n     else\n \tdie \"$(gettext \"You have not concluded your merge (MERGE_HEAD exists).\")\"\n     fi\n-- \n2.6.0\n"}]}