Merge branch 'rs/grep-color'
commit1692d0c64a6386ae08d12ed90c9d975911451cbe
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:13 +0000 (29 17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:13 +0000 (29 17:03 -0700)
tree94398b8e23fa0f5f15fce10a128aa0757e3ad3e6
parentb985f2aecaa6358b55d545385d0624d76ff83fb8
parent1d84f72ef1dee1f851e11a6d92e8ab3f1979b2a2
Merge branch 'rs/grep-color'

* rs/grep-color:
  grep: add --heading
  grep: add --break
  grep: fix coloring of hunk marks between files
t/t7810-grep.sh