Merge branch 'dev' of gitlab.com:WzukW/oclaunch into dev

  Conflicts:
 	src/command_def.ml
 	src/oclaunch.ml

All conflict were indentation/empty-line problems.

src/command_def.ml

@@ -270,6 +270,7 @@ let run ~version ~build_info () =
     |> run ~version ~build_info
   in
 
+  (* Return error code with exceptions *)
   let exit_code =
     match
       hack_parse ()
@@ -297,6 +298,7 @@ let run ~version ~build_info () =
   (* Display total running time, to float is a number of secconds *)
   Messages.debug Time.(now () |> to_float |> (-.) start |> ( *. ) (-1.)
   |> sprintf "Runned during %f second(s)");
+
   (* Reset display *)
   Messages.reset ();
 

src/oclaunch.ml

@@ -47,6 +47,5 @@ let build_info = ( "Build with OCaml version " ^ (Sys.ocaml_version) ^ " on " ^
 
 let () =
   Command_def.run ~version:version_number ~build_info:build_info ()
-  |> function
-    `Exit n -> exit n
+  |> function `Exit n -> exit n
 ;;

src/test/.merlin

@@ -1,3 +1,4 @@
 PKG oUnit alcotest core
 
 S ../
+REC