Merge branch 'jk/mailmap-incomplete-line'

* jk/mailmap-incomplete-line:
  mailmap: handle mailmap blobs without trailing newlines

diff --cc mailmap.c
Simple merge

diff --cc t/t4203-mailmap.sh
Simple merge