From 41c4553e7135613034cd8ee893e59ccf14ba9e77 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Jun 2011 02:40:10 +0000
Subject: [PATCH] further refine check-conflicts to avoid false positives

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bb99a7b79..f74379727 100644
--- a/Makefile
+++ b/Makefile
@@ -409,7 +409,7 @@ clean:
 	make clean
 
 check-conflicts:
-	! grep -r --exclude='*config.log.*' '--exclude=*config.status.*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler.*' '^=======$$' .
+	! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' .
 
 #these are probably only useful if you're me...
 
-- 
2.11.0