Change %merge result type clash warnings to errors. Discussed at

[bison.git] / .cvsignore

diff --git a/.cvsignore b/.cvsignore
index fe6b0096ed0d38ed95798c4ae165cfec668e0511..98d36692c0c4b77ca4d82d45302d20d754977f68 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,13 +1,29 @@
+*.flc
+*.patch *.log log patches applied
+*.prj
+ABOUT-NLS
+COPYING
+INSTALL

 Makefile
 Makefile

+Makefile.in
+_*
+a.exe
+a.out
+aclocal.m4
+autom4te.cache
+b.out
+bison-*
+conf[0-9]*
+confdefs*

 config.cache
 config.h
 config.cache
 config.h

+config.hin

 config.log
 config.status
 config.log
 config.status

-stamp-h*
-bison-*
+configure
+configure.lineno
+conftest*
+intl

 patches
 patches

-*.patch *.log log patches applied
-*.prj

 releases
 releases

-*.flc
-autom4te.cache
+stamp-h*