===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/entries.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- src/usr.bin/cvs/entries.c	2015/01/16 06:40:07	1.103
+++ src/usr.bin/cvs/entries.c	2015/04/04 14:19:10	1.104
@@ -1,4 +1,4 @@
-/*	$OpenBSD: entries.c,v 1.103 2015/01/16 06:40:07 deraadt Exp $	*/
+/*	$OpenBSD: entries.c,v 1.104 2015/04/04 14:19:10 stsp Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -151,6 +151,7 @@
 	ent->ce_rev = NULL;
 	ent->ce_date = -1;
 	ent->ce_tag = NULL;
+	ent->ce_time = NULL;
 
 	if (ent->ce_type == CVS_ENT_FILE) {
 		if (*fields[2] == '-') {
@@ -187,6 +188,8 @@
 			if (strncmp(fields[3], "Result of merge+", 16) == 0)
 				p += 16;
 
+			ent->ce_time = xstrdup(p);
+
 			/* Date field can be a '+=' with remote to indicate
 			 * conflict.  In this case do nothing. */
 			if (strptime(p, "%a %b %d %T %Y", &t) != NULL) {
@@ -383,6 +386,9 @@
 {
 	if (ent->ce_rev != NULL)
 		rcsnum_free(ent->ce_rev);
+	if (ent->ce_time != NULL)
+		xfree(ent->ce_time);
+
 	xfree(ent->ce_buf);
 	xfree(ent);
 }