# [PATCH 4/5] git-merge-octopus: do not capitalize "octopus"

1 messages from 2016-09-08 to 2016-09-08. Participants: Alex Henrie.
Thread: https://gitlist.dev/t/44039

## Alex Henrie, 2016-09-08 04:34

Subject: [PATCH 4/5] git-merge-octopus: do not capitalize "octopus"
Message-ID: <20160908043440.5995-1-alexhenrie24@gmail.com>
URL: https://gitlist.dev/e/20160908043440.5995-1-alexhenrie24%40gmail.com

```
In English, only proper nouns are capitalized.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 git-merge-octopus.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 308eafd..bcf0d92 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -30,7 +30,7 @@ do
 	esac
 done
 
-# Reject if this is not an Octopus -- resolve should be used instead.
+# Reject if this is not an octopus -- resolve should be used instead.
 case "$remotes" in
 ?*' '?*)
 	;;
@@ -59,7 +59,7 @@ do
 		# conflicts.  Last round failed and we still had
 		# a head to merge.
 		gettextln "Automated merge did not work."
-		gettextln "Should not be doing an Octopus."
+		gettextln "Should not be doing an octopus."
 		exit 2
 	esac
 
-- 
2.9.3


```