Skip to content

Commit

Permalink
Update Merlin
Browse files Browse the repository at this point in the history
  • Loading branch information
@voodoos
voodoos committed Mar 3, 2021
1 parent 5df0ce2 commit b4078c3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ocaml-lsp-server/vendor/merlin
Submodule merlin updated 13 files
+2 −2 src/kernel/dune
+70 −9 src/kernel/mconfig_dot.ml
+2 −2 src/ocaml/preprocess/410/parser_raw.ml
+17 −3 src/ocaml/utils/misc.ml
+1 −0 src/platform/dune
+4 −0 src/platform/os_ipc.ml
+24 −0 src/platform/platform_misc.c
+8 −2 src/utils/menhirLib.ml
+1 −1 src/utils/menhirLib.mli
+17 −0 tests/dune.inc
+1 −0 tests/test-dirs/config/symlinks.t/real/dune-project
+0 −0 tests/test-dirs/config/symlinks.t/real/main.ml
+44 −0 tests/test-dirs/config/symlinks.t/run.t

0 comments on commit b4078c3

Please sign in to comment.