Code

Merge branch 'tr/grep-l-with-decoration' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 21:59:02 +0000 (13:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 21:59:02 +0000 (13:59 -0800)
* tr/grep-l-with-decoration:
  grep: fix -l/-L interaction with decoration lines


Trivial merge