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