Merge branch 'ag/userdiff-go-funcname' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2018 20:18:30 +0000 (12:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2018 20:18:30 +0000 (12:18 -0800)
"git diff" and friends learned funcname patterns for Go language
source files.

* ag/userdiff-go-funcname:
userdiff: add built-in pattern for golang

Trivial merge