Merge trunk changes into this branch.

FossilOrigin-Name: 719973d7f5a47b110e9919fcb96d21feab1e41356dbb3ec674c1116c17bbb778

diff --cc manifest
index 34b86f367fae216d355d02313b8f4f38177b36dc,55ef9f2d35258f276c00efc80adf4b8ec0891f0e..917f0cad5862546f0a7565a48f0de7b0cc1369ba
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sextra\stest\sfor\s'deletemerge'.
- D 2023-07-25T16:48:54.280
 -C Reformulate\sa\s(sed\s-i)\sconstruct\sin\sext/wasm/GNUmakefile\sto\saccount\sfor\sMac's\ssed\s-i\sbeing\sdifferent\sthan\sGNU's.
 -D 2023-07-25T12:26:05.338
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2023-07-25T17:11:29.440
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2048,8 -2044,8 +2049,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 1079300db2a7d1fbc86a01c215c234a3af64889c5396e6da63ff4f3c7efae4c5
- R 5e50972831b0957645434d1b66948061
 -P 80927c3913561dddf75cf73be871d93ae06b16f83e8cc36fc360765014209615
 -R 6a5bd7ff24557139b19e78c4a48cb406
 -U stephan
 -Z 524f840828c91fa63ac22024dbea11bc
++P bc33cff4203cef12518e0f43d380a06d53d67c725fb96cfe6e934b7dc97a7efd 907dfc4a7aa129cdcedeb3ba2d75e1b68a8f22c2545ee1c8cf7d705041644e5c
++R 5993fc46555382a2aec905b2562709d9
 +U dan
- Z 17e8bfe851f3a2d36e6b484a74a5eecf
++Z f3d75212bb4c6c0a11dfe9cd7501540a
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 20b6bcd04788d5ead64b22b61ad51535d37c3cbf,d8bafbc0f91a873954a2a4e581c55de5af148761..bceb7ba86dbbffdab76599debc568e35b1e22c77
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bc33cff4203cef12518e0f43d380a06d53d67c725fb96cfe6e934b7dc97a7efd
 -907dfc4a7aa129cdcedeb3ba2d75e1b68a8f22c2545ee1c8cf7d705041644e5c
++719973d7f5a47b110e9919fcb96d21feab1e41356dbb3ec674c1116c17bbb778