fix: merlin tests

Signed-off-by: Sachin Beniwal <s474996633@gmail.com>

Author: benodiwal

test/blackbox-tests/test-cases/pkg/merlin/dev-tool-merlin-basic.t

@@ -10,7 +10,7 @@ a lockdir containing an "ocaml" lockfile.
 
   $ cat > dune-project <<EOF
   > (lang dune 3.16)
-  >
+  > 
   > (package
   >  (name foo)
   >  (allow_empty)

test/blackbox-tests/test-cases/pkg/merlin/dev-tool-merlin-env.t

@@ -9,7 +9,7 @@ executable in PATH is the one installed by dune as a dev tool.
 
   $ cat > dune-project <<EOF
   > (lang dune 3.16)
-  >
+  > 
   > (package
   >  (name foo)
   >  (allow_empty)

test/blackbox-tests/test-cases/pkg/merlin/dev-tool-merlin-relock-on-ocaml-version-change.t

@@ -13,7 +13,7 @@ same version of the ocaml compiler as the code that it's analyzing.
 
   $ cat > dune-project <<EOF
   > (lang dune 3.16)
-  >
+  > 
   > (package
   >  (name foo)
   >  (allow_empty)
@@ -33,17 +33,27 @@ Initially merlin will depend on ocaml-base-compiler.5.2.0 to match the project.
   hello from fake ocamlmerlin
   $ cat "${dev_tool_lock_dir}"/ocaml-base-compiler.pkg
   (version 5.2.0)
+  
+  (depends ocaml-compiler)
 
 We can re-run "dune tools exec ocamlmerlin" without relocking or rebuilding.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune tools exec ocamlmerlin
+  The version of the compiler package ("ocaml-base-compiler") in this project's
+  lockdir has changed to 5.2.0 (formerly the compiler version was 5.2.0). The
+  dev-tool "merlin" will be re-locked and rebuilt with this version of the
+  compiler.
+  Solution for _build/.dev-tools.locks/merlin:
+  - merlin.0.0.1
+  - ocaml-base-compiler.5.2.0
+  - ocaml-compiler.5.2.0
        Running 'ocamlmerlin'
   hello from fake ocamlmerlin
 
 Change the version of ocaml that the project depends on.
 
   $ cat > dune-project <<EOF
   > (lang dune 3.16)
-  >
+  > 
   > (package
   >  (name foo)
   >  (allow_empty)
@@ -68,3 +78,5 @@ before running. Merlin now depends on ocaml-base-compiler.5.1.0.
   hello from fake ocamlmerlin
   $ cat "${dev_tool_lock_dir}"/ocaml-base-compiler.pkg
   (version 5.1.0)
+  
+  (depends ocaml-compiler)