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)
commit34ad5a52b44d1b95f3b8833c02a0920f3454755b
tree633ed4e6b0d487b4b65202b9fcfbe6e4670b0785
parentc3c7797e1d151417333296ab3720614c1e235094
parent42536dd9b9829b4eb4e3706e141b3c8bffa3e826
Merge branch 'jm/maint-diff-words-with-sbe'

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