diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-03-06 14:44:52 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-03-06 14:44:52 +0000 |
| commit | 92107daf44524d76e29e39fb793d562dfd31325e (patch) | |
| tree | f3b98f18e4c1a8bdb879f5341888a723d5dd1f01 /usr.bin/rcs/rcsmerge.c | |
| parent | 399f79b1e1cf765420b6be78422a5504d194e261 (diff) | |
move compat flags into a STANDARDS section;
update usage() whilst here...
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index e1275614814..331856a3d62 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.15 2006/03/06 13:22:59 xsa Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.16 2006/03/06 14:44:51 jmc Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -159,6 +159,6 @@ void rcsmerge_usage(void) { fprintf(stderr, - "usage: rcsmerge [-TV] [-kmode] [-p[rev]] [-q[rev]] " - "[-rrev] [-xsuffixes] file ...\n"); + "usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]] " + "[-rrev] [-xsuffixes] [-ztz] file ...\n"); } |