diff --git a/OCaml.gitignore b/OCaml.gitignore index f7817ae5c36f9ddef21eb6c9796b5c35976cc80f..da0b20424a0337c1e6089d68aaddd5674c347528 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