src/usr.bin/diff3/diff3.1, branch releng/12.2FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F12.22017-05-25T18:46:13ZUpdate the diff3 manpage to reflect the fact the version in freebsd does2017-05-25T18:46:13ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T18:46:13Zurn:sha1:9500abb088b81472d52941ad73f592396a684af8
not use temporary files nor uses a /usr/libexec/diff3prog
Import working progress BSD diff32017-05-25T17:45:50ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T17:45:50Zurn:sha1:e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f
import bsd diff3 from OpenBSD.
Differences with OpenBSD:
- lots of warning fixed
- no shell wrapper with diff3 actually living in libexec
- capsicumized
Keep it disconnected as it is not yet good enough to replace GNU diff
The motivation to import it now it to allow other people to jump in and also to
have an open development on it
Obtained from: OpenBSD