projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
30e0af5
)
added protection to Makfile against deploying cvs conflicts
author
ivan
<ivan>
Wed, 15 Jun 2011 01:41:06 +0000
(
01:41
+0000)
committer
ivan
<ivan>
Wed, 15 Jun 2011 01:41:06 +0000
(
01:41
+0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
8db4c1e
..
d4b1611
100644
(file)
--- 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 '^=======$$' .
+ ! 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...