git.ipfire.org Git - thirdparty/sqlite.git/commit

]> git.ipfire.org Git - thirdparty/sqlite.git/commit

projects / thirdparty / sqlite.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: fd6ddf9) | patch

author	dan <dan@noemail.net>
	Thu, 8 Mar 2012 18:39:03 +0000 (18:39 +0000)
committer	dan <dan@noemail.net>
	Thu, 8 Mar 2012 18:39:03 +0000 (18:39 +0000)
commit	593c9824bcb36dce3a8d1a5b939e9b4be41f6596
tree	1a83f0de349362368e8a406263bb25b7cb47f242	tree
parent	fd6ddf91b0711b6b6cfe0938db56fc9bc2cd8dcf	commit \| diff

Add the 'merge=?,?' command to fts4. This still needs some work.

FossilOrigin-Name: 741b8f897750eac3c9774fd65de7e40bb89781b1

ext/fts3/fts3Int.h		diff \| blob \| blame \| history
ext/fts3/fts3_write.c		diff \| blob \| blame \| history
manifest		diff \| blob \| blame \| history
manifest.uuid		diff \| blob \| blame \| history
test/fts3_common.tcl		diff \| blob \| blame \| history
test/fts4merge.test	[new file with mode: 0644]	blob

Mirror of https://github.com/sqlite/sqlite.git