From f0c7587ea53b855ca58ce73d3e25f7e81215a722 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 27 Sep 2018 16:39:39 +0200
Subject: [dune] [merlin] Fix some usability issues.

As suggested on Gitter by @maximedenes we improve documentation and
update Kernel's `.merlin` so it actually reports on the stricter set
of warnings.

We also set the language version to the proper one so users will get a
better error message [the fact that we can use `(env_var ...)` with
the wrong Dune version is a Dune bug indeed].
---
 dune-workspace | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dune-workspace')

diff --git a/dune-workspace b/dune-workspace
index 682631e7dc..aae70e598b 100644
--- a/dune-workspace
+++ b/dune-workspace
@@ -1,4 +1,4 @@
-(lang dune 1.1)
+(lang dune 1.2)
 
 ; Add custom flags here. Default developer profile is `dev`
 (env
-- 
cgit v1.2.3