mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-05 09:14:03 +00:00
Add missing *roff macros to correct display about -V option.
PR: docs/4162 Submitted by: Kazuo Horikawa <k-horik@yk.rim.or.jp
This commit is contained in:
parent
1b659bfe0b
commit
3511ae5bba
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=28619
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user