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: https://git.lorimer.id.au/gitweb.git/diff_plain/1c67d534d9d807639a505835eb3505b103426b47?hp=1c67d534d9d807639a505835eb3505b103426b47

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>
---