===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/cvs/diff3.c	2008/02/29 21:43:57	1.44
--- src/usr.bin/cvs/diff3.c	2008/03/01 14:40:23	1.45
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.44 2008/02/29 21:43:57 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.45 2008/03/01 14:40:23 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.44 2008/02/29 21:43:57 joris Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.45 2008/03/01 14:40:23 joris Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 247,253 ****
  	}
  
  	(void)close(cf->fd);
! 	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));
--- 247,253 ----
  	}
  
  	(void)close(cf->fd);
! 	cf->fd = open(cf->file_path, O_CREAT | O_RDWR | O_TRUNC, 0644);
  	if (cf->fd == -1) {
  		fatal("cvs_merge_file: failed to reopen fd for writing: %s",
  		    strerror(errno));