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)
commit3e9e41659394fe5de085c90f4f86858062dfa47d
treecce6f05b79900447ee4d56067ef9da7376b449f0
parentfc75ad72dc7955d3077db4a72818d24de007a582
parent50dd0f2fd910d9973760db052897ee8e73ed2f1f
Merge branch 'tr/grep-l-with-decoration'

* tr/grep-l-with-decoration:
  grep: fix -l/-L interaction with decoration lines