Merge changelog entries for #1698 and #1705)

ocaml · Nov 15, 2023 · af05ab8 · af05ab8
1 parent d3eb391
commit af05ab8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,9 +2,9 @@ merlin NEXT_VERSION
 ===================
 
   + merlin binary
-    - Rename `-cache-period` flag to `-cache-lifespan`. (#1705)
     - Fix a follow-up issue to the preference of non-ghost nodes introduced in #1660 (#1690, fixes #1689)
-    - Add `--cache-period` flag, that sets cache invalidation period. (#1698)
+    - Add `-cache-lifespan` flag, that sets cache invalidation period. (#1698,
+      #1705)
     - Fix Merlin locate not fallbacking on the correct file in case of ambiguity
       (@goldfirere, #1699)
   + editor modes