===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** src/usr.bin/cvs/update.c	2006/01/27 15:26:38	1.54
--- src/usr.bin/cvs/update.c	2006/03/14 15:59:06	1.55
***************
*** 1,4 ****
! /*	$OpenBSD: update.c,v 1.54 2006/01/27 15:26:38 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: update.c,v 1.55 2006/03/14 15:59:06 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 284,290 ****
  		 * available, we try to merge it into the existing changes.
  		 */
  		if (revdiff == 1) {
! 			fbuf = cvs_diff3(rf, fpath, cf->cf_lrev, frev);
  			if (fbuf == NULL) {
  				cvs_log(LP_ERR, "merge failed");
  				break;
--- 284,290 ----
  		 * available, we try to merge it into the existing changes.
  		 */
  		if (revdiff == 1) {
! 			fbuf = cvs_diff3(rf, fpath, cf->cf_lrev, frev, 0);
  			if (fbuf == NULL) {
  				cvs_log(LP_ERR, "merge failed");
  				break;