mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Code Issues Releases Activity

Update the diff3 manpage to reflect the fact the version in freebsd does

Browse Source 
not use temporary files nor uses a /usr/libexec/diff3prog
This commit is contained in:
Baptiste Daroussin 2017-05-25 18:46:13 +00:00
parent ab00ac327a
commit 9500abb088
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=318892
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/diff3/diff3.1
View File

@ -30,7 +30,7 @@
.\" @(#)diff3.1 8.2 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
.Dd $Mdocdate: May 31 2007 $
.Dd May 25, 2017
.Dt DIFF3 1
.Os
.Sh NAME
@ -157,26 +157,6 @@ The lines beneath this notation are ranges of lines which are exclusively
different in file
.Va n .
.El
.Sh ENVIRONMENT
.Bl -tag -width TMPDIR
.It Ev TMPDIR
If the environment variable
.Ev TMPDIR
exists,
.Nm
will use the directory specified by
.Ev TMPDIR
as the temporary directory.
.El
.Sh FILES
.Bl -tag -width /usr/libexec/diff3 -compact
.It Pa /tmp/d3a.XXXXXXXXXX
temporary file
.It Pa /tmp/d3b.XXXXXXXXXX
temporary file
.It Pa /usr/libexec/diff3
the actual executable
.El
.Sh SEE ALSO
.Xr diff 1 ,
.Xr ed 1 ,