Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint
commit7d0dafe3945408aeef9c2e5256ac926976170e54
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 01:03:34 +0000 (18 17:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 01:03:34 +0000 (18 17:03 -0800)
tree01187d82cec0dfc4d72bbcf42a35abb4a27ca6ed
parentb9cb07726a7a288244b585939850348f319e5e0c
parent34f3999206e8ea41b9e4cf48e30ab1149e01d8a5
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint

* jm/maint-1.6.5-grep-NUL-terminate:
  grep: NUL terminate input from a file
builtin-grep.c