From d7ef4a90b7ebcdc05ce0e61821b733fcdbd2c6c4 Mon Sep 17 00:00:00 2001
From: Jason McIntyre <jmc@cvs.openbsd.org>
Date: Mon, 24 Apr 2006 13:32:11 +0000
Subject: - move -A into compat land - tweak -E description accordingly

ok xsa
---
 usr.bin/rcs/rcsmerge.1 | 18 +++++++-----------
 usr.bin/rcs/rcsmerge.c |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'usr.bin/rcs')

diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1
index 93bb4ba9f4e..2c2e51dc67b 100644
--- a/usr.bin/rcs/rcsmerge.1
+++ b/usr.bin/rcs/rcsmerge.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcsmerge.1,v 1.7 2006/04/24 08:18:06 jmc Exp $
+.\"	$OpenBSD: rcsmerge.1,v 1.8 2006/04/24 13:32:10 jmc Exp $
 .\"
 .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
 .\" All rights reserved.
@@ -22,7 +22,7 @@
 .Nd merge RCS revisions
 .Sh SYNOPSIS
 .Nm
-.Op Fl AEeV
+.Op Fl EeV
 .Op Fl k Ns Ar mode
 .Op Fl p Ns Op Ar rev
 .Op Fl q Ns Op Ar rev
@@ -45,13 +45,9 @@ man page for more information.
 .Pp
 The following options are supported:
 .Bl -tag -width Ds
-.It Fl A
-Most verbose output.
 .It Fl E
-Less information than
-.Fl A .
-This is the default.
-See
+Default merge:
+see
 .Xr diff3 1
 for details.
 .It Fl e
@@ -109,7 +105,7 @@ overwriting the working copy:
 .Xr rcsdiff 1 ,
 .Xr rlog 1
 .Sh STANDARDS
-The flag
-.Op Fl T
-has no effect and is provided
+The flags
+.Op Fl AT
+have no effect and are provided
 for compatibility only.
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index ba4d92ef71e..3f5d14f00e6 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.32 2006/04/24 08:18:06 jmc Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.33 2006/04/24 13:32:10 jmc Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -175,6 +175,6 @@ void
 rcsmerge_usage(void)
 {
 	fprintf(stderr,
-	    "usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]]\n"
+	    "usage: rcsmerge [-EeV] [-kmode] [-p[rev]] [-q[rev]]\n"
 	    "                [-xsuffixes] [-ztz] -rrev file ...\n");
 }
-- 
cgit v1.2.3