History log of /freebsd-13.1/usr.bin/diff3/diff3.1 (Results 1 – 5 of 5)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: release/12.4.0, release/13.1.0, release/12.3.0
# a8446d41 23-Aug-2021 Piotr Pawel Stefaniak <[email protected]>

diff3: document and test -T

(cherry picked from commit 9f7a81b133c715f649136dcd0ad004e4180c56c9)


# dbabfd7e 21-Aug-2021 Piotr Pawel Stefaniak <[email protected]>

diff3: implement --strip-trailing-cr

(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)


# 000d0345 20-Aug-2021 Piotr Pawel Stefaniak <[email protected]>

diff3.1: update manual page to match code

(cherry picked from commit e8ff95356ceaaa941251056e9d0a4211bf428e06)


Revision tags: release/13.0.0, release/12.2.0, release/11.4.0, release/12.1.0, release/11.3.0, release/12.0.0, release/11.2.0, release/10.4.0, release/11.1.0
# 9500abb0 25-May-2017 Baptiste Daroussin <[email protected]>

Update the diff3 manpage to reflect the fact the version in freebsd does
not use temporary files nor uses a /usr/libexec/diff3prog


# e1910ebd 25-May-2017 Baptiste Daroussin <[email protected]>

Import working progress BSD diff3

import bsd diff3 from OpenBSD.
Differences with OpenBSD:
- lots of warning fixed
- no shell wrapper with diff3 actually living in libexec
- capsicumized

Keep it di

Import working progress BSD diff3

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

show more ...