Merge trunk

FossilOrigin-Name: 79dfaf05b81a5d83042251429ec97d6f3d6a596965ac345a9112f174d6447ee6

diff --cc autosetup/sqlite-config.tcl
Simple merge

diff --cc manifest
index f150f50f154e3700e4825c6b4b36e317586f5385,34318f8d3a78bbe4b84216d3d92b6958ba961c19..3b7dd2f61b446de9a70f7984ef7cc01fcf12d564
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C win32longpath\smakes\sno\ssense\son\sCygwin.\sAll\stests\spass\snow\s(except\sdelete_db-1.3.0)
- D 2025-04-04T06:47:36.689
 -C Minor\sconfigure\sscript\sinternal\sdoc\sedits.\sNo\sfunctional\schanges.
 -D 2025-04-04T03:26:20.472
++C Merge\strunk
++D 2025-04-04T06:49:24.262
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -51,8 -51,8 +51,8 @@@ F autosetup/cc.tcl c0fcc50ca91deff8741e
  F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
  F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
- F autosetup/proj.tcl cac07d75249fa127500b8e96080dc807e9ae97fe98d29e84a17bc28f4628e93f
- F autosetup/sqlite-config.tcl 6893300c8822815d0424f1ea9da82b93732e486bc8d7b2ae9f15050ac1170bf3
+ F autosetup/proj.tcl dfead6099674665c1b59f54e740b47bc6d00dded5e58460528140725fefcb4bf
 -F autosetup/sqlite-config.tcl c197e3275b1723e7a2c1cc9c9f8aeca67b7159617924e1db78ba02901c6a69c3
++F autosetup/sqlite-config.tcl 6b3cf6fb38a4cdf95cb5e9a5a20d5def4c42e17c9b76af7690eb3c07648641a4
  F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
  F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
  F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@@ -746,9 -746,9 +746,9 @@@ F src/hash.h 46b92795a95bfefb210f52f0c3
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c a5f0366266be993ebf533808f22cb7a788624805b55bc45424ceed3f48c54a16
- F src/json.c 81e2012796a0e139b18c50ee3444c8ef86a020ab360511882216f5b610657e0c
+ F src/json.c fbae43c3920110be8d5307003d37d2b85b9bfb6d6d70fcb56ab68204026141af
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 -F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 +F src/loadext.c 4cde2939fab9a640d8123882a81309543267edbcd78b1fba1697475a39557488
  F src/main.c 07f78d917ffcdf327982840cfd8e855fd000527a2ea5ace372ce4febcbd0bf97
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@@ -2216,8 -2216,8 +2216,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 6552bfb70ae91ee28aadaa6ec22c8ecd272e2e68f175f0dc494b6ec2b96909bf
- R 118cee36983dc4834f684f55ae964fb2
 -P b78a474ecba6cae4f0e867a515c214fbfe229808145df1870315328d4e13d462
 -R 9aa2d52ba180605dad925fa228fdde81
 -U stephan
 -Z 2db58c825c2b8a1bbf25d32c18ff3da7
++P 5cf5d2cedf3ea9879cc2162644e318dc7a23c2effefc381e3905a51f3643b1e4 357563bc7c01a744d4038ed3ccc475260b819e98cf90a4270764f79c73d2497e
++R 8687e1b53a25d6ff405a3aab0cc09c9c
 +U jan.nijtmans
- Z e8a83810a4c0fca4b3c3e0c18e4cfd75
++Z b843279799f6ce4cf1d810e15cf6260d
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 01f89812012e196eefda360599579d39611ff095,27edce24a07b893d6cf380d1d14e7f9a53b04ba3..9f1ad9f9133f5fefdb6fe4bffcb1ab3cbe0099e0
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5cf5d2cedf3ea9879cc2162644e318dc7a23c2effefc381e3905a51f3643b1e4
 -357563bc7c01a744d4038ed3ccc475260b819e98cf90a4270764f79c73d2497e
++79dfaf05b81a5d83042251429ec97d6f3d6a596965ac345a9112f174d6447ee6