From: Johannes Sixt Date: Sun, 26 Nov 2006 21:30:01 GMT Subject: Re: [PATCH] grep: do not skip unmerged entries when grepping in the working tree. Message-ID: <200611262230.01948.johannes.sixt@telecom.at> In-Reply-To: <7vvel2rl05.fsf@assigned-by-dhcp.cox.net> On Sunday 26 November 2006 21:49, Junio C Hamano wrote: > We used to skip unmerged entries, which made sense for grepping > in the cached copies, but not for grepping in the files on the > working tree. > > Noticed by Johannes Sixt. > > Signed-off-by: Junio C Hamano This fixes my problem. Thanks!