diff options
author | ivan <ivan> | 2011-06-15 02:38:25 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-06-15 02:38:25 +0000 |
commit | 4b7a46869736e37d849dab5825324fb8f1d630ca (patch) | |
tree | 8bd5a0ce9ab9283225fade494ae1f7f2697cfbd5 | |
parent | 2c2ef354ac4311c07796dca34340d7e4b5c59520 (diff) |
further refine check-conflicts to avoid false positives
-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... |