2 Commits

Author	SHA1	Message	Date
drh	0d65dc0e90	Five-algorithm conflict resolution appears to be working. (CVS 363) ... FossilOrigin-Name: 0115518f8e4591123582e3d2bb67282111ebcf60	2002-02-03 00:56:09 +00:00
drh	b419a926d4	Added ON CONFLICT support to COPY. Updates to documentation. Bug fixes. (CVS 359) ... FossilOrigin-Name: cf1538d71c9ce12d5e59f367e03642cbcaf6b717	2002-01-30 16:17:23 +00:00