Code

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 01:03:34 +0000 (17:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 01:03:34 +0000 (17:03 -0800)
* jm/maint-1.6.5-grep-NUL-terminate:
  grep: NUL terminate input from a file

1  2 
builtin-grep.c

diff --cc builtin-grep.c
Simple merge