diff options
author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-22 12:50:39 +0000 |
---|---|---|
committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-22 12:50:39 +0000 |
commit | 3fdfcb3cde55fbbcda00115a7b72197bfae3ee90 (patch) | |
tree | 718bd9a0fb94bd8855004563a8787965cc8022b8 | |
parent | d512dcc09f9c237dc309d0f3809bb03918b24c35 (diff) |
- document `-kmode'
- add EXAMPLES section
ok jmc@.
-rw-r--r-- | usr.bin/rcs/rcsdiff.1 | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcsdiff.1 b/usr.bin/rcs/rcsdiff.1 index 64b48f5f35e..8e61269d6fd 100644 --- a/usr.bin/rcs/rcsdiff.1 +++ b/usr.bin/rcs/rcsdiff.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsdiff.1,v 1.11 2005/11/21 20:06:34 xsa Exp $ +.\" $OpenBSD: rcsdiff.1,v 1.12 2005/11/22 12:50:38 xsa Exp $ .\" .\" Copyright (c) 2005 Joris Vink <joris@openbsd.org> .\" All rights reserved. @@ -24,6 +24,7 @@ .Nm .Bk -words .Op Fl cnquV +.Op Fl k Ns Ar mode .Oo .Fl r Ns Ar rev .Op Fl r Ns Ar rev2 @@ -43,6 +44,8 @@ Produces a diff with three lines of context. See .Xr diff 1 for more information. +.It Fl k Ns Ar mode +Specify the keyword substitution mode. .It Fl n Produces a diff in the same format that is used in the RCS files. .It Fl r Ns Ar rev @@ -77,6 +80,19 @@ are to be created. The default is set to .Pa /tmp . .El +.Sh EXAMPLES +Compare the latest revision of the default branch with the content of +working file +.Pa foo.c : +.Pp +.Dl $ rcsdiff foo.c +.Pp +.Pp +Compare revision 1.7 and 1.8 of file +.Pa foo.c +and ignore differences in keyword values: +.Pp +.Dl $ rcsdiff -kk -r1.7 -r1.8 foo.c .Sh SEE ALSO .Xr ci 1 , .Xr co 1 , |