From: Alex Henrie <alexhenrie24@gmail.com>
Date: Thu, 8 Sep 2016 04:34:40 +0000 (-0600)
Subject: git-merge-octopus: do not capitalize "octopus"
X-Git-Tag: v2.10.1~30^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c67d534d9d807639a505835eb3505b103426b47;p=thirdparty%2Fgit.git

git-merge-octopus: do not capitalize "octopus"

In English, only proper nouns are capitalized.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 308eafd1d3..bcf0d92ec2 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