4 commits

Author	SHA1	Message	Date
Piotr Pawel Stefaniak	dbabfd7e26	diff3: implement --strip-trailing-cr ... (cherry picked from commit 54a3415cb6)	2021-09-25 10:34:39 +02:00
Piotr Pawel Stefaniak	000d03450b	diff3.1: update manual page to match code ... (cherry picked from commit e8ff95356c)	2021-09-25 10:34:39 +02:00
Baptiste Daroussin	9500abb088	Update the diff3 manpage to reflect the fact the version in freebsd does ... not use temporary files nor uses a /usr/libexec/diff3prog	2017-05-25 18:46:13 +00:00
Baptiste Daroussin	e1910ebda4	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	2017-05-25 17:45:50 +00:00