src/usr.bin/diff3/diff3.1, branch releng/13.4FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F13.42023-08-23T17:43:32ZRemove $FreeBSD$: one-line nroff pattern2023-08-23T17:43:32ZWarner Loshimp@FreeBSD.org2023-08-22T01:32:13Zurn:sha1:24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2
Remove /^\.\\"\s*\$FreeBSD\$$\n/
Similar commit in main:
(cherry picked from commit b2c76c41be32)
diff3: document and test -T2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-23T19:33:27Zurn:sha1:a8446d4124d0639b0fe49e25642a18a51fde8666
(cherry picked from commit 9f7a81b133c715f649136dcd0ad004e4180c56c9)
diff3: implement --strip-trailing-cr2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-21T00:28:58Zurn:sha1:dbabfd7e26763ac295ed0ee8bc77f3f3b58b6d03
(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
diff3.1: update manual page to match code2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-20T22:50:05Zurn:sha1:000d03450ba0c5ac37f2a83335b6c09ada1dcca9
(cherry picked from commit e8ff95356ceaaa941251056e9d0a4211bf428e06)
Update 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