Code

Merge branch 'js/blame-parsename'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:32 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:32 +0000 (10:50 -0700)
* js/blame-parsename:
  t/annotate-tests: Use echo & cat instead of sed
  blame: tolerate bogus e-mail addresses a bit better

1  2 
builtin/blame.c

diff --cc builtin/blame.c
Simple merge