Merge branch 'jn/mailmap-update'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:01 +0000 (16:16 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:01 +0000 (16:16 +0900)
The mailmap file update.

* jn/mailmap-update:
mailmap: consistently normalize brian m. carlson's name

1  2 
.mailmap
diff --cc .mailmap
Simple merge