summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2011-06-15 02:40:11 +0000
committerivan <ivan>2011-06-15 02:40:11 +0000
commit9e067daedd4a399014430d47800e13e7494a0f28 (patch)
tree0a9a86d00d8cbc2ee4244d7cdf6f009377a3370e
parent8c039243bb832cf9c8d382a5f5c46fa3408d4042 (diff)
further refine check-conflicts to avoid false positives
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cf8bc045a..6f96d8bb4 100644
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,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...