Merge branch 'fix/eva/merlin' into 'master'

[Eva] Adds .merlin file in Eva to solve file conflicts between plugins.

See merge request frama-c/frama-c!3540

headers/header_spec.txt

@@ -1316,6 +1316,7 @@ src/plugins/studia/writes.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/users/Users.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/users/users_register.ml: CEA_LGPL_OR_PROPRIETARY
 src/plugins/users/users_register.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/value/.merlin: .ignore
 src/plugins/value/Changelog_non_free: .ignore
 src/plugins/value/Eva.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/value/alarmset.ml: CEA_LGPL_OR_PROPRIETARY

src/plugins/value/.merlin

+B ./**
+S ./**
+B ../value_types/**
+S ../value_types/**
+REC