Merge branch 'jm/maint-diff-words-with-sbe' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:43:00 +0000 (09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:43:00 +0000 (09:43 -0700)
* jm/maint-diff-words-with-sbe:
  do not read beyond end of malloc'd buffer

1  2 
diff.c

diff --cc diff.c
Simple merge