===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/annotate.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/cvs/annotate.c	2005/04/03 17:32:50	1.6
--- src/usr.bin/cvs/annotate.c	2005/04/11 17:56:27	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: annotate.c,v 1.6 2005/04/03 17:32:50 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: annotate.c,v 1.7 2005/04/11 17:56:27 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 86,99 ****
  			rev = optarg;
  			break;
  		default:
! 			return (EX_USAGE);
  		}
  	}
  
  	if ((date != NULL) && (rev != NULL)) {
  		cvs_log(LP_ERR,
  		    "the -D and -d arguments are mutually exclusive");
! 		return (EX_USAGE);
  	}
  
  	*arg = optind;
--- 86,99 ----
  			rev = optarg;
  			break;
  		default:
! 			return (1);
  		}
  	}
  
  	if ((date != NULL) && (rev != NULL)) {
  		cvs_log(LP_ERR,
  		    "the -D and -d arguments are mutually exclusive");
! 		return (1);
  	}
  
  	*arg = optind;