projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e40181b
)
added protection to Makfile against deploying cvs conflicts
author
ivan
<ivan>
Wed, 15 Jun 2011 01:41:13 +0000
(
01:41
+0000)
committer
ivan
<ivan>
Wed, 15 Jun 2011 01:41:13 +0000
(
01:41
+0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
d4b1611
..
b9afd42
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-409,7
+409,7
@@
clean:
make clean
check-conflicts:
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...
#these are probably only useful if you're me...