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

[bison.git] / .cvsignore

diff --git a/.cvsignore b/.cvsignore
index 3daf990348f9782842bb8239fd24cd2853a20882..98d36692c0c4b77ca4d82d45302d20d754977f68 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,19 +1,29 @@
+*.flc
+*.patch *.log log patches applied
+*.prj
+ABOUT-NLS
+COPYING
+INSTALL
 Makefile
+Makefile.in
+_*
+a.exe
+a.out
+aclocal.m4
+autom4te.cache
+b.out
+bison-*
+conf[0-9]*
+confdefs*
 config.cache
 config.h
+config.hin
 config.log
 config.status
-stamp-h*
-bison-*
+configure
+configure.lineno
+conftest*
+intl
 patches
-*.patch *.log log patches applied
-*.prj
 releases
-*.flc
-autom4te.cache
-intl
-Makefile.in
-configure
-config.hin
-aclocal.m4
-ABOUT-NLS
+stamp-h*