X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=diffcore-pickaxe.c;h=fea62d51a090e22e43938245747e409ea7ede883;hb=c504aae2a6c96f1363562a3aa1dc05fb4462e978;hp=be1bbcc53f1d489dccd9e8b8ce4ad9c1c39c107b;hpb=f7c1512af8ff4f821c530f9a4bc8f8ff25733d51;p=git.git

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index be1bbcc5..fea62d51 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -44,7 +44,8 @@ void diffcore_pickaxe(const char *needle)
 			if (contains(p->one, needle, len))
 				diff_q(&outq, p);
 		}
-		else if (contains(p->one, needle, len) !=
+		else if (!diff_unmodified_pair(p) &&
+			 contains(p->one, needle, len) !=
 			 contains(p->two, needle, len))
 			diff_q(&outq, p);
 		if (onum == outq.nr)