kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Alex Henrie 2016-09-07 22:34:40 -06:00 committed by Junio C Hamano
parent 7c406bd8a7
commit 1c67d534d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge-octopus.sh
View File

@ -30,7 +30,7 @@ do
esac esac
done 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 case "$remotes" in
?*' '?*) ?*' '?*)
;; ;;
@ -59,7 +59,7 @@ do
# conflicts. Last round failed and we still had # conflicts. Last round failed and we still had
# a head to merge. # a head to merge.
gettextln "Automated merge did not work." gettextln "Automated merge did not work."
gettextln "Should not be doing an Octopus." gettextln "Should not be doing an octopus."
exit 2 exit 2
esac esac