Merge branch 'rs/grep-color'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:13 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:13 +0000 (17:03 -0700)
* rs/grep-color:
  grep: add --heading
  grep: add --break
  grep: fix coloring of hunk marks between files

1  2 
t/t7810-grep.sh

diff --cc t/t7810-grep.sh
Simple merge