Merge branch 'lb/contrib-contacts-looser-diff-parsing'
commited277519613d6f6bb422c4e4b7523ef8981a1c25
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:24:59 +0000 (14 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:24:59 +0000 (14 14:24 -0700)
tree8dcf98637f86f0f425240669d5141cf224ab8305
parent08f36302b5d04cf06a35acc91689b0278cbf6a73
parent8f72011f1c4a626ed1c1e826661d42274f465e29
Merge branch 'lb/contrib-contacts-looser-diff-parsing'

* lb/contrib-contacts-looser-diff-parsing:
  git-contacts: do not fail parsing of good diffs