summaryrefslogtreecommitdiff
path: root/vendor/gitignore/OCaml.gitignore
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/gitignore/OCaml.gitignore')
-rw-r--r--vendor/gitignore/OCaml.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/vendor/gitignore/OCaml.gitignore b/vendor/gitignore/OCaml.gitignore
index f7817ae5c36..da0b20424a0 100644
--- a/vendor/gitignore/OCaml.gitignore
+++ b/vendor/gitignore/OCaml.gitignore
@@ -18,3 +18,6 @@ _build/
# oasis generated files
setup.data
setup.log
+
+# Merlin configuring file for Vim and Emacs
+.merlin