summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2016-09-08 04:34:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-08 19:17:10 (GMT)
commit1c67d534d9d807639a505835eb3505b103426b47 (patch)
tree4289fd69bd9c755052285e7505da6a1f58b9bc05
parent7c406bd8a7511c6e16f4dbe2ab5d7e57db7a8f72 (diff)
downloadgit-1c67d534d9d807639a505835eb3505b103426b47.zip
git-1c67d534d9d807639a505835eb3505b103426b47.tar.gz
git-1c67d534d9d807639a505835eb3505b103426b47.tar.bz2
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>
-rwxr-xr-xgit-merge-octopus.sh4
1 files 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