summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorivan <ivan>2011-06-15 02:40:10 +0000
committerivan <ivan>2011-06-15 02:40:10 +0000
commit41c4553e7135613034cd8ee893e59ccf14ba9e77 (patch)
tree7f8c443f2e5017d7596bb79ee3b4aefa2231ae53 /Makefile
parent4b7a46869736e37d849dab5825324fb8f1d630ca (diff)
further refine check-conflicts to avoid false positives
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bb99a7b..f743797 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...