diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-04-19 11:16:15 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-04-19 11:16:15 +0000 |
| commit | 9a844318226ccb44fc573779b6ee31f5af4e966e (patch) | |
| tree | 8bb6591db06e393520d6a5e050c137270c416bc9 /usr.bin/rcs | |
| parent | ebcaba4b1202acd92e00c9249688ea46be9fd41b (diff) | |
- signpost to keyword substitution section
- simplify synopsis
Diffstat (limited to 'usr.bin/rcs')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index cec085e5d3c..f40de6e1251 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.5 2006/03/06 14:44:51 jmc Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.6 2006/04/19 11:16:14 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -22,7 +22,6 @@ .Nd merge RCS revisions .Sh SYNOPSIS .Nm -.Bk -words .Op Fl AEeV .Op Fl k Ns Ar mode .Op Fl p Ns Op Ar rev @@ -30,14 +29,20 @@ .Op Fl r Ns Ar rev .Op Fl x Ns Ar suffixes .Op Fl z Ns Ar tz -.Ar file ... -.Ek +.Ar .Sh DESCRIPTION The .Nm program merges changes between two revisions of an RCS file into the corresponding working file. .Pp +.Nm +also supports +keyword substitution \(en +see the +.Xr rcs 1 +man page for more information. +.Pp The following options are supported: .Bl -tag -width Ds .It Fl A |