Merge branch 'jm/maint-diff-words-with-sbe'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 17:27:42 +0000 (10:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 17:27:42 +0000 (10:27 -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