Merge branch 'tr/grep-l-with-decoration'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:15 +0000 (22:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:15 +0000 (22:01 -0800)
* tr/grep-l-with-decoration:
  grep: fix -l/-L interaction with decoration lines


Trivial merge