===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- src/usr.bin/cvs/rcs.c	2006/02/13 11:02:58	1.129
+++ src/usr.bin/cvs/rcs.c	2006/02/26 16:06:46	1.130
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.129 2006/02/13 11:02:58 xsa Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.130 2006/02/26 16:06:46 niallo Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -2931,6 +2931,7 @@
 	}
 
 	if (type == CHECKOUT_REV_CREATED ||
+	    type == CHECKOUT_REV_MERGED ||
 	    type == CHECKOUT_REV_UPDATED) {
 		ctime_r(&rcstime, timebuf);
 		l = strlen(timebuf);