From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2012 21:59:02 +0000 (-0800)
Subject: Merge branch 'tr/grep-l-with-decoration' into maint
X-Git-Tag: v1.7.9.1~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=184a7aa7bf8e42ce9aba12b92d9cf8014d04a947;p=git.git

Merge branch 'tr/grep-l-with-decoration' into maint

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

184a7aa7bf8e42ce9aba12b92d9cf8014d04a947