--- freem/ChangeLog	2025/05/19 21:29:28	1.185
+++ freem/ChangeLog	2025/05/20 18:07:40	1.190
@@ -1188,9 +1188,7 @@ VERSION 0.65.0-rc0
   * Return build configuration to default [snw@hesperos 05/14/25 09:30:06]
   * Fix linker error on errno symbol in locktab.c [snw@syrena.coherent-logic.com 05/14/25 20:49:12]
   * Remove old SEMK_ macros since ftok is now used throughout to determine semaphore keys [snw@syrena.coherent-logic.com 05/14/25 22:14:21]
-<<<<<<< ChangeLog
   * Add back the refactored global handler [snw@eosphorus 05/16/25 21:57:48]
-=======
   * Make FreeM build on macOS on Apple Silicon [snw@primus.local 05/15/25 21:02:03]
   * Make shm seed NULL on ARM [snw@primus.local 05/15/25 21:24:58]
   * Fix macOS port [snw@primus.local 05/15/25 21:33:57]
@@ -1201,7 +1199,6 @@ VERSION 0.65.1-rc0
 
   * Change version from 0.65.0-rc0 to 0.65.1-rc0 [snw@syrena.coherent-logic.com 05/16/25 07:22:41]
   * Bump version to account for shared memory changes [snw@syrena.coherent-logic.com 05/16/25 07:23:00]
->>>>>>> 1.173
   * Add back the refactored global handler [snw@eosphorus 05/16/25 21:58:01]
   * Make it possible to select the modernized global handler with the configure script and update documentation and README.md [snw@eosphorus 05/17/25 11:00:03]
   * Update credits in README.md [snw@eosphorus 05/17/25 11:04:21]
@@ -1213,13 +1210,14 @@ VERSION 0.65.1-rc0
   * Reverse-engineer and document ZINSERT and ZREMOVE [snw@eosphorus 05/19/25 06:45:00]
 
 ********************************************************************************
-VERSION cvs-current
-
-
-********************************************************************************
 VERSION 0.65.1-rc1
 
   * Change version from cvs-current to 0.65.1-rc1 [snw@eosphorus 05/19/25 07:14:17]
   * Bump version [snw@eosphorus 05/19/25 07:14:32]
   * Extend ZEDIT to create the specified routine if it does not yet exist [snw@eosphorus 05/19/25 11:57:18]
   * Add basic tab completion to direct mode [snw@eosphorus 05/19/25 15:29:27]
+  * Documentation updates; raise ZCMMND instead of NOSTAND for restricted_mode restrictions [snw@eosphorus 05/20/25 08:36:03]
+  * Fix direct-mode interface to online help [snw@hesperos 05/20/25 08:56:55]
+  * Fix ChangeLog [snw@hesperos 05/20/25 08:58:44]
+  * Update ROUTINE SSVN after ZEDIT and ZSAVE [snw@hesperos 05/20/25 10:20:39]
+  * Add completion to debugger [snw@hesperos 05/20/25 12:07:40]