diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-05-09 14:03:56 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-05-09 14:03:56 +0000 |
| commit | c92d45370aaa1c365b0102025a34a726bb5427dc (patch) | |
| tree | 622a5f4e474ce6687d01d1bbf0d8700ea0d1be75 /usr.bin/rcs/rcsmerge.1 | |
| parent | 09fc369f16cbdc3f2f5341c0d5b3c888cebe65f9 (diff) | |
move -e to compat land; pointed out by ray
ok xsa
Diffstat (limited to 'usr.bin/rcs/rcsmerge.1')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index 282c31af2ea..a57ffd01459 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.11 2006/05/08 10:02:02 xsa Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.12 2006/05/09 14:03:55 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 EeV +.Op Fl EV .Op Fl k Ns Ar mode .Op Fl p Ns Op Ar rev .Op Fl q Ns Op Ar rev @@ -50,10 +50,6 @@ Default merge: see .Xr diff3 1 for details. -.It Fl e -Same as -.Fl E -but does not warn about conflicts. .It Fl k Ns Ar mode Specify the keyword substitution mode. .It Fl p Ns Op Ar rev @@ -119,6 +115,6 @@ An error occurred. .Xr rlog 1 .Sh STANDARDS The flags -.Op Fl AT +.Op Fl AeT have no effect and are provided for compatibility only. |