summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Alex Henrie <alexhenrie24@gmail.com>2016-09-07 22:34:40 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 12:17:10 -0700
commit1c67d534d9d807639a505835eb3505b103426b47 (patch)
tree4289fd69bd9c755052285e7505da6a1f58b9bc05 /ll-merge.h
parentgit-rebase--interactive: fix English grammar (diff)
downloadtgif-1c67d534d9d807639a505835eb3505b103426b47.tar.xz
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>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions