diff options
| author |   jmc <jmc@openbsd.org> | 2006-04-24 08:18:06 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2006-04-24 08:18:06 +0000 |
| commit | 9097f5378708c68166857ac99d654c73b81d4077 (patch) | |
| tree | fb504799cdd78d6ca59daaaaba2a6402abefab68 | |
| parent | be consistent in error messages for wrongly specified keyword substitution (diff) | |
| download | wireguard-openbsd-9097f5378708c68166857ac99d654c73b81d4077.tar.xz wireguard-openbsd-9097f5378708c68166857ac99d654c73b81d4077.zip | |
-r is not optional: simplify its synopsis, but improve its description;
ok xsa
| -rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 9 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index f40de6e1251..93bb4ba9f4e 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.6 2006/04/19 11:16:14 jmc Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.7 2006/04/24 08:18:06 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -26,9 +26,9 @@ .Op Fl k Ns Ar mode .Op Fl p Ns Op Ar rev .Op Fl q Ns Op Ar rev -.Op Fl r Ns Ar rev .Op Fl x Ns Ar suffixes .Op Fl z Ns Ar tz +.Fl r Ns Ar rev .Ar .Sh DESCRIPTION The @@ -67,6 +67,11 @@ Be quiet about reporting. .It Fl r Ns Ar rev Merge with respect to revision .Ar rev . +This option should be specified twice to merge changes +between two specific revisions. +If only one revision is specified, +merging is done between that revision and +the latest revision of the default branch. .It Fl V Print RCS's version number. .It Fl x Ns Ar suffixes diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index 75030374038..ba4d92ef71e 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.31 2006/04/24 08:10:41 xsa Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.32 2006/04/24 08:18:06 jmc Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -176,5 +176,5 @@ rcsmerge_usage(void) { fprintf(stderr, "usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]]\n" - " [-rrev] [-xsuffixes] [-ztz] file ...\n"); + " [-xsuffixes] [-ztz] -rrev file ...\n"); } |