{"thread":{"id":"44039","subject":"[PATCH 4/5] git-merge-octopus: do not capitalize \"octopus\"","startedAt":"2016-09-08T04:34:51Z","lastAt":"2016-09-08T04:34:51Z","messageCount":1,"participants":["Alex Henrie"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"301361","messageId":"20160908043440.5995-1-alexhenrie24@gmail.com","threadId":"44039","inReplyTo":null,"subject":"[PATCH 4/5] git-merge-octopus: do not capitalize \"octopus\"","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2016-09-08T04:34:40Z","receivedAt":"2016-09-08T04:34:51Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"In English, only proper nouns are capitalized.\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n git-merge-octopus.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-merge-octopus.sh b/git-merge-octopus.sh\nindex 308eafd..bcf0d92 100755\n--- a/git-merge-octopus.sh\n+++ b/git-merge-octopus.sh\n@@ -30,7 +30,7 @@ do\n \tesac\n done\n \n-# Reject if this is not an Octopus -- resolve should be used instead.\n+# Reject if this is not an octopus -- resolve should be used instead.\n case \"$remotes\" in\n ?*' '?*)\n \t;;\n@@ -59,7 +59,7 @@ do\n \t\t# conflicts.  Last round failed and we still had\n \t\t# a head to merge.\n \t\tgettextln \"Automated merge did not work.\"\n-\t\tgettextln \"Should not be doing an Octopus.\"\n+\t\tgettextln \"Should not be doing an octopus.\"\n \t\texit 2\n \tesac\n \n-- \n2.9.3\n\n"}]}