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 <junkio@xxxxxxx> This fixes my problem. Thanks! -- Hannes - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html