===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- src/usr.bin/cvs/diff3.c	2008/02/28 20:35:27	1.43
+++ src/usr.bin/cvs/diff3.c	2008/02/29 21:43:57	1.44
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3.c,v 1.43 2008/02/28 20:35:27 joris Exp $	*/
+/*	$OpenBSD: diff3.c,v 1.44 2008/02/29 21:43:57 joris Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -72,7 +72,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: diff3.c,v 1.43 2008/02/28 20:35:27 joris Exp $";
+    "$OpenBSD: diff3.c,v 1.44 2008/02/29 21:43:57 joris Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -247,7 +247,7 @@
 	}
 
 	(void)close(cf->fd);
-	cf->fd = open(cf->file_path, O_WRONLY | O_TRUNC);
+	cf->fd = open(cf->file_path, O_CREAT | O_WRONLY | O_TRUNC);
 	if (cf->fd == -1) {
 		fatal("cvs_merge_file: failed to reopen fd for writing: %s",
 		    strerror(errno));