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

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

projects / thirdparty / sqlite.git / commit

author	dan <dan@noemail.net>
	Mon, 18 Aug 2014 19:30:01 +0000 (19:30 +0000)
committer	dan <dan@noemail.net>
	Mon, 18 Aug 2014 19:30:01 +0000 (19:30 +0000)
commit	6885bbc71382ce75a126c51574330fdc1a6cf3f0
tree	231f1922434bb98335eb331533884fb2946999df	tree \| snapshot
parent	0bbd9c27c258779e0531b694f68da0b593ed1d07	commit \| diff

Add an "automerge=0" mode that disables auto-merging and falls back to fts4-style crisis merges.

FossilOrigin-Name: 2397404e152b908d838e6491294b263b05943b3f

ext/fts5/fts5.c		diff \| blob \| blame \| history
ext/fts5/fts5.h		diff \| blob \| blame \| history
ext/fts5/fts5Int.h		diff \| blob \| blame \| history
ext/fts5/fts5_index.c		diff \| blob \| blame \| history
manifest		diff \| blob \| blame \| history
manifest.uuid		diff \| blob \| blame \| history
tool/loadfts.c		diff \| blob \| blame \| history

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

RSS Atom