Merge branch 'rs/maint-grep-word-regexp-fix' into maint
commit3489428367e0d9d95cf90a8a7f537db958f9a78a
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:48:09 +0000 (2 07:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:48:09 +0000 (2 07:48 -0700)
treede2344f45f03a01a3e89f20ebdd1e31dcb12eb30
parentb91ffd37d5c18046f7b0bf47e939273bead9e52e
parent1f5b9cc40e80a8a7902236a26844be138887b1d9
Merge branch 'rs/maint-grep-word-regexp-fix' into maint

* rs/maint-grep-word-regexp-fix:
  grep: fix colouring of matches with zero length
  grep: fix word-regexp at the beginning of lines