Merge branch 'jm/maint-diff-words-with-sbe' into maint
commitd9ac3e41c37ea565d8227d942b4f468616c9813a
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:43:00 +0000 (26 09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:43:00 +0000 (26 09:43 -0700)
tree7ff9e5e77766fa3f0fae8cea269cb285939a19ef
parent05318994e7fcb6a652a8329bf7ba7f8d6696ee3c
parent42536dd9b9829b4eb4e3706e141b3c8bffa3e826
Merge branch 'jm/maint-diff-words-with-sbe' into maint

* jm/maint-diff-words-with-sbe:
  do not read beyond end of malloc'd buffer
diff.c