Sync w/trunk. Ready for merge to trunk.

FossilOrigin-Name: ff67460e1a3d21c9ca7cbd171fbc5e6cbdb3797de359887f851776b73b732fdf

diff --cc manifest
index f83d8ca586ec2905bc23b41e41f194b47b99212b,4b77a98c23f2684129a55a158fdedfe35c8a212b..bda28a448fb50b3d8fc3da82e556be3e8193e7ae
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stest/basexx1.test\sto\stest\sis_base85(t),\sbase85(x)\sand\sbase64(x).\sSync\sw/trunk.
- D 2022-11-22T19:04:09.365
 -C Fix\sthe\serror\smessage\sin\sthe\sCLI\sfor\s"no\ssuch\sVFS".\n[forum:/info/1217fdd6b3|Forum\spost\s1217fdd6b3].
 -D 2022-11-22T18:24:07.441
++C Sync\sw/trunk.\sReady\sfor\smerge\sto\strunk.
++D 2022-11-22T19:12:24.820
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -645,7 -642,7 +645,7 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 3fc60a8f0b54db15e86584c5fd68dbf63c20fe86886a39267ce7dfc17b68853d
- F src/shell.c.in 49b6aeaf950b9b7a74aca7b80e6d004ed32f0a16d2c9471e34587cc4755d5eaa
 -F src/shell.c.in 7d1705f139e6762e8c0fe254a8ebf3ab77aec6d8366f033cdd5f5ebadefbbb20
++F src/shell.c.in 6bb8e3b54f079e5373199e2fb0ebe8acf5cd4dcac4bbfe2467b1cddbf15ced80
  F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@@ -2063,8 -2059,8 +2063,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 da940d507e9e31a84daedede44a56f743198d7258a9e83892511fe8dd4c78d2b 6d5dc9eed54b7d883aa7dbe2eb5ff17d2a703eabdb7d548a27cccc1fe5addb4a
- R 8126534722ae13c74b5c3a4e8e3049df
 -P 6d5dc9eed54b7d883aa7dbe2eb5ff17d2a703eabdb7d548a27cccc1fe5addb4a
 -R c32ff36f085986b819f258da8a8464b1
 -U drh
 -Z f12a671d42ea42f2f1054a78088f03c4
++P 4e4334547795f659b4a5dc5fdaf842535643750a5f1ce1af799c526931a473e4 861af465fda8485dfff143dc45c659b884d826aaec2ebaa941566404d1fe427b
++R cae00067ec49a50025b1793060d59681
 +U larrybr
- Z a05ff028bb3426fe686b2f69a24ff770
++Z d8609990d08ea7644109ee0cd1dbe1fb
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index eb38a17bd2f3b82897086e82181ea2eb01812e0e,26acee9357209f3b20254f5bea4a746fa55fa036..353741cd279a214a6c88c864efd101d769755302
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4e4334547795f659b4a5dc5fdaf842535643750a5f1ce1af799c526931a473e4
 -861af465fda8485dfff143dc45c659b884d826aaec2ebaa941566404d1fe427b
++ff67460e1a3d21c9ca7cbd171fbc5e6cbdb3797de359887f851776b73b732fdf

diff --cc src/shell.c.in
Simple merge