Differences From Artifact [55ec98db6d]:

• File src/schema.c — part of check-in [9c28bca430] at 2012-02-10 23:37:14 on branch trunk — Record --backout and --cherrypick merges in the VMERGE table with IDs -2 and -1, respectively. On a --cherrypick merge, make the default check-in comment be the same as the check-in comment for the cherrypicked change. (user: drh size: 20366) [more...]

To Artifact [573176f67b]:

• File src/schema.c — part of check-in [a496d8e88d] at 2012-03-29 14:54:45 on branch mgagnon_fix — Add vim modline everywhere (user: mgagnon size: 20408)

482
483
484
485
486
487
488

@ CREATE TABLE vmerge(
@   id INTEGER REFERENCES vfile,      -- VFILE entry that has been merged
@   merge INTEGER,                    -- Merged with this record
@   UNIQUE(id, merge)
@ );
@   
;

>
>
>
>
>

482
483
484
485
486
487
488
489
490
491
492
493

@ CREATE TABLE vmerge(
@   id INTEGER REFERENCES vfile,      -- VFILE entry that has been merged
@   merge INTEGER,                    -- Merged with this record
@   UNIQUE(id, merge)
@ );
@   
;

/* 
 * vim:ts=2:sts=2:et:sw=2:ft=c 
 */