Log Message:
-----------
Update MERGE:
>
> To implement this cleanly requires that the table have a unique index
> so duplicate checking can be easily performed.
>
Modified Files:
--------------
pgsql/doc:
TODO (r1.1696 -> r1.1697)
(http://developer.postgresql.org/cvsweb.cgi/pgsql/doc/TODO.diff?r1=1.1696&r2=1.1697)
pgsql/doc/src/FAQ:
TODO.html (r1.203 -> r1.204)
(http://developer.postgresql.org/cvsweb.cgi/pgsql/doc/src/FAQ/TODO.html.diff?r1=1.203&r2=1.204)