summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-07-24 21:25:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-07-24 21:25:34 +0000
commit58374ef19acd6b2834d814bccfd159f06ac2a90f (patch)
tree5d0d8a27de4019e5828def944c265462a6d56e1e /gnu/usr.bin
parentedd8005722b88c4b620fb4c125cab3fe14e52b7d (diff)
blank line; k-horik@yk.rim.or.jp
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/rcs/man/merge.13
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/usr.bin/rcs/man/merge.1 b/gnu/usr.bin/rcs/man/merge.1
index 19460d7a505..46f44df7590 100644
--- a/gnu/usr.bin/rcs/man/merge.1
+++ b/gnu/usr.bin/rcs/man/merge.1
@@ -2,7 +2,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id $Id: merge.1,v 1.1 1996/08/12 04:07:48 millert Exp $
+.Id $Id: merge.1,v 1.2 1997/07/24 21:25:33 deraadt Exp $
.TH MERGE 1 \*(Dt GNU
.SH NAME
merge \- three-way file merge
@@ -114,6 +114,7 @@ Send results to standard output instead of overwriting
.TP
.BI \-q
Quiet; do not warn about conflicts.
+.TP
.BI \-V
Print \*r's version number.
.SH DIAGNOSTICS