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

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