diff options
author | ivan <ivan> | 2011-06-15 02:40:10 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-06-15 02:40:10 +0000 |
commit | 41c4553e7135613034cd8ee893e59ccf14ba9e77 (patch) | |
tree | 7f8c443f2e5017d7596bb79ee3b4aefa2231ae53 /Makefile | |
parent | 4b7a46869736e37d849dab5825324fb8f1d630ca (diff) |
further refine check-conflicts to avoid false positives
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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... |