From faaaa2a24c2e03925cc6abb04bdb18617d39e826 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Thu, 25 May 2017 18:46:13 +0000
Subject: [PATCH] Update the diff3 manpage to reflect the fact the version in
 freebsd does not use temporary files nor uses a /usr/libexec/diff3prog

---
 usr.bin/diff3/diff3.1 | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1
index f7fda1636d13..84985632b8b8 100644
--- a/usr.bin/diff3/diff3.1
+++ b/usr.bin/diff3/diff3.1
@@ -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 ,