diff --git a/OCaml.gitignore b/OCaml.gitignore index f7817ae5..da0b2042 100644 --- a/OCaml.gitignore +++ b/OCaml.gitignore @@ -18,3 +18,6 @@ _build/ # oasis generated files setup.data setup.log + +# Merlin configuring file for Vim and Emacs +.merlin