Merge branch 'rs/threaded-grep-context' into next
commit1934af16bbe3c3d7544f6769426d4aee5ab99b7b
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:59:50 +0000 (28 21:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:59:50 +0000 (28 21:59 -0700)
treec8e47ba671e51efd11818a4c5164a64933251e2b
parent305ad0b7cf3d45c27fcbb3203fcdbc685f09b4d1
parent431d6e7bc85f693fe49a04142a8ab4d2d72b0257
Merge branch 'rs/threaded-grep-context' into next

* rs/threaded-grep-context:
  grep: enable threading for context line printing

Conflicts:
grep.c
builtin/grep.c
grep.c