===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/rcs/rcsmerge.c	2006/08/01 05:14:17	1.47
--- src/usr.bin/rcs/rcsmerge.c	2006/08/11 08:18:19	1.48
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.47 2006/08/01 05:14:17 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.48 2006/08/11 08:18:19 xsa Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 46,53 ****
  
  	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) {
  		switch (ch) {
! 		case 'A': case 'E': case 'e':
  			break;
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
--- 46,63 ----
  
  	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) {
  		switch (ch) {
! 		case 'A':
! 			/*
! 			 * kept for compatibility
! 			 */
  			break;
+ 		case 'E':
+ 			flags |= MERGE_EFLAG;
+ 			flags |= MERGE_OFLAG;
+ 			break;
+ 		case 'e':
+ 			flags |= MERGE_EFLAG;
+ 			break;
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
***************
*** 133,140 ****
  	if (rcsnum_cmp(rev1, rev2, 0) == 0)
  		goto out;
  
! 	if ((bp = rcs_diff3(file, argv[0], rev1, rev2,
! 	    !(flags & QUIET))) == NULL)
  		errx(D_ERROR, "failed to merge");
  
  	if (!(flags & QUIET)) {
--- 143,149 ----
  	if (rcsnum_cmp(rev1, rev2, 0) == 0)
  		goto out;
  
! 	if ((bp = rcs_diff3(file, argv[0], rev1, rev2, flags)) == NULL)
  		errx(D_ERROR, "failed to merge");
  
  	if (!(flags & QUIET)) {