svn commit: r318892 - head/usr.bin/diff3
Baptiste Daroussin
bapt at FreeBSD.org
Thu May 25 18:46:15 UTC 2017
Author: bapt
Date: Thu May 25 18:46:13 2017
New Revision: 318892
URL: https://svnweb.freebsd.org/changeset/base/318892
Log:
Update the diff3 manpage to reflect the fact the version in freebsd does
not use temporary files nor uses a /usr/libexec/diff3prog
Modified:
head/usr.bin/diff3/diff3.1
Modified: head/usr.bin/diff3/diff3.1
==============================================================================
--- head/usr.bin/diff3/diff3.1 Thu May 25 18:16:17 2017 (r318891)
+++ head/usr.bin/diff3/diff3.1 Thu May 25 18:46:13 2017 (r318892)
@@ -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 rang
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 ,
More information about the svn-src-head
mailing list