4 Commits

Author	SHA1	Message	Date
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	cb5a670ece	For now comment tests for arguments which are not in par with GNU diff3 yet	2017-05-25 17:58:01 +00:00
Baptiste Daroussin	433115a0a4	Remove the MAX_CHECK macro, it was initially used to test if a file was a ... text file or not. The check is not done by diff3 but by diff (the argument -a is directly passed to diff(1))	2017-05-25 17:55:40 +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