From 14a95b9bcbeee3c9e0b33e42252128d98ee1073e Mon Sep 17 00:00:00 2001
From: KINSANG CHING <chengjsh@mail2.sysu.edu.cn>
Date: Fri, 15 Sep 2017 12:45:14 +0800
Subject: [PATCH] Update OCaml.gitignore

Merlin is a code completion for OCaml in Vim and Emacs. Such configuraing file is common
---
 OCaml.gitignore | 3 +++
 1 file changed, 3 insertions(+)

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