From b071a4006833bf5ede5820ea72cd414aa0dd217e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 10 May 2004 03:58:19 +0000
Subject: [PATCH] Add:

> * Add MERGE command that does UPDATE, or on failure, INSERT
---
 doc/TODO | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/TODO b/doc/TODO
index 4bea3342e2d..7a2977b705f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Thu May  6 15:32:03 EDT 2004
+Last updated:		Sun May  9 23:58:19 EDT 2004
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
 
@@ -187,6 +187,7 @@ Commands
 * Have pg_ctl look at PGHOST in case it is a socket directory
 * Allow column-level privileges
 * Add a session mode to warn about non-standard SQL usage
+* Add MERGE command that does UPDATE, or on failure, INSERT
 
 * ALTER
 	o -ALTER TABLE ADD COLUMN does not honor DEFAULT and non-CHECK CONSTRAINT
-- 
GitLab