summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1997-08-23 15:50:53 +0000
committerSteve Price <steve@FreeBSD.org>1997-08-23 15:50:53 +0000
commit3511ae5bba0cd28138269c37eedc15db5d286961 (patch)
treef12bdff329dd59b1bd4c1bfa90229054212e5723 /gnu/usr.bin/rcs
parent1b659bfe0b98cd0667db5aaadacea323544a42e0 (diff)
downloadsrc-test2-3511ae5bba0cd28138269c37eedc15db5d286961.tar.gz
src-test2-3511ae5bba0cd28138269c37eedc15db5d286961.zip
Notes
Diffstat (limited to 'gnu/usr.bin/rcs')
-rw-r--r--gnu/usr.bin/rcs/merge/merge.14
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1
index 2bf0142f4177..73ae65cec38b 100644
--- a/gnu/usr.bin/rcs/merge/merge.1
+++ b/gnu/usr.bin/rcs/merge/merge.1
@@ -2,7 +2,8 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id $Id$
+.Id $Id: merge.1,v 1.4 1997/02/22 15:47:50 peter Exp $
+.ds r \&\s-1RCS\s0
.TH MERGE 1 \*(Dt GNU
.SH NAME
merge \- three-way file merge
@@ -114,6 +115,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