Merge branch 'rs/maint-grep-word-regexp-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:48:09 +0000 (07:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:48:09 +0000 (07:48 -0700)
* rs/maint-grep-word-regexp-fix:
  grep: fix colouring of matches with zero length
  grep: fix word-regexp at the beginning of lines


Trivial merge