aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1d1ff9df..638906af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
.*.aux
*.cmti
*.cmt
-*.merlin
# Emacs saves
*~
# Executables and configuration
@@ -23,6 +22,8 @@ clightgen.byte
tools/ndfun
tools/modorder
Makefile.config
+.merlin
+_CoqProject
# Generated files
.depend
.depend.extr