diff options
author | ivan <ivan> | 2011-06-15 02:38:26 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-06-15 02:38:26 +0000 |
commit | 8c039243bb832cf9c8d382a5f5c46fa3408d4042 (patch) | |
tree | b45a817143181ecd097731b9d69f88a75eb9a756 | |
parent | c282832e8fba535b718858b8b1a1ec074d55a2cd (diff) |
further refine check-conflicts to avoid false positives
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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... |