Merge branch 'jk/mailmap-incomplete-line' into maint
commit19230ab8a80d0a78ac396234c557f0dd8d564a04
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:57:32 +0000 (18 11:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:57:33 +0000 (18 11:57 -0700)
treea91476706c5d712cf13c476b339889c9db00e99e
parentd5b99f35bd9102cf25ffb5d438898fa0c625defd
parentf972a1658a30809db113a3c486b1fe95b56633bf
Merge branch 'jk/mailmap-incomplete-line' into maint

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