* [PATCH 4/5] git-merge-octopus: do not capitalize "octopus"
@ 2016-09-08 4:34 Alex Henrie
0 siblings, 0 replies; only message in thread
From: Alex Henrie @ 2016-09-08 4:34 UTC (permalink / raw)
To: vascomalmeida, gitster, git; +Cc: Alex Henrie
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-08 4:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-08 4:34 [PATCH 4/5] git-merge-octopus: do not capitalize "octopus" Alex Henrie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).