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>
Alex Henrie committed
Sep 7, 2016 at 22:34 UTC
1c67d534d9d807639a505835eb3505b103426b47
1 file changed
+2
-2
git-merge-octopus.sh
+2
-2
@@ -30,7 +30,7 @@ do
30
esac
31
done
32
33
-# Reject if this is not an Octopus -- resolve should be used instead.
33
+# Reject if this is not an octopus -- resolve should be used instead.
34
case "$remotes" in
35
?*' '?*)
36
;;
@@ -59,7 +59,7 @@ do
59
# conflicts. Last round failed and we still had
60
# a head to merge.
61
gettextln "Automated merge did not work."
62
- gettextln "Should not be doing an Octopus."
62
+ gettextln "Should not be doing an octopus."
63
exit 2
64
esac
65