From f013a5c00930a085e4f9923d3d042d92e5a72135 Mon Sep 17 00:00:00 2001
From: Shayne Fletcher <shaynefletcher@meta.com>
Date: Tue, 25 Oct 2022 09:26:06 -0700
Subject: [PATCH] ignore .merlin files

Summary: prevent `.merlin` files from being managed by mercrial

Reviewed By: vsiles

Differential Revision: D40678341

fbshipit-source-id: d82d4353deead4998c7eb89a32d08fde300ec747
---
 hphp/hack/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hphp/hack/.gitignore b/hphp/hack/.gitignore
index deb01ee9ca4ee3..d6b43ad4086b37 100644
--- a/hphp/hack/.gitignore
+++ b/hphp/hack/.gitignore
@@ -19,6 +19,7 @@ facebook/opam2-mini-repository-*
 facebook/opam2-mini-repository-*.tar.gz
 target/
 dev_env.sh
+.merlin
 # Generated by scripts/build_rust_to_ocaml.sh; the script can't delete it
 # without creating a race condition when we're doing parallel builds.
 #