From: KINSANG CHING <chengjsh@mail2.sysu.edu.cn>
Date: Fri, 15 Sep 2017 04:45:14 +0000 (+0800)
Subject: Update OCaml.gitignore
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14a95b9bcbeee3c9e0b33e42252128d98ee1073e;p=gitignore.git

Update OCaml.gitignore

Merlin is a code completion for OCaml in Vim and Emacs. Such configuraing file is common
---

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