aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2015-12-07 14:45:37 +0100
committerBernhard Schommer <bernhardschommer@gmail.com>2015-12-07 14:45:37 +0100
commitff9fedbbcc45993dfe2c4f0a372596782603921c (patch)
tree9a42b6a52b6bd7aa289e318dbba5b2fbb89ea059 /.gitignore
parent0386265191303ca71d054e5f868d2a9e92f30fc5 (diff)
downloadcompcert-kvx-ff9fedbbcc45993dfe2c4f0a372596782603921c.tar.gz
compcert-kvx-ff9fedbbcc45993dfe2c4f0a372596782603921c.zip
Ignore .merlin files. Bug 17742
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 05d33563..d05ff07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
*.cmxa
*.cmti
*.cmt
+*.merlin
# Emacs saves
*~
# Executables and configuration