Merge branch 'jk/mailmap-incomplete-line'
commitaf226bf01e99043f5f3d8bc09ad302d17e0de757
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:50:41 +0000 (9 14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:50:41 +0000 (9 14:50 -0700)
treef04089cfa49837b0e8dd86b5cc560bda262d08a0
parenta23274e127fdb1674361271f14f7269f0a019cc2
parentf972a1658a30809db113a3c486b1fe95b56633bf
Merge branch 'jk/mailmap-incomplete-line'

* jk/mailmap-incomplete-line:
  mailmap: handle mailmap blobs without trailing newlines
mailmap.c
t/t4203-mailmap.sh