diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index 6267f4cc4a5..61569dc063e 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.2 2005/11/02 11:26:19 xsa Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.3 2005/11/22 14:17:45 xsa Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -81,6 +81,18 @@ Specify the time zone for keyword substitution. If set, this variable should contain a list of space-delimited options that are prepended to the argument list. .El +.Sh EXAMPLES +Merge differences between revision 1.4 and 1.8 of +.Pa foo.c +and print the result to standard output: +.Pp +.Dl $ rcsmerge -p -r1.4 -r1.8 foo.c +.Pp +Undo changes between revision 2.4 and 2.8 of +.Pa foo.c , +overwriting the working copy: +.Pp +.Dl $ rcsmerge -r2.8 -r2.4 foo.c .Sh SEE ALSO .Xr ci 1 , .Xr co 1 , |