aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3
Commit message (Expand)AuthorAgeFilesLines
* DIRDEPS_BUILD: Connect new directories.Bryan Drewery2017-10-311-0/+11
* Add HAS_TESTS to all Makefiles that are currently using theEnji Cooper2017-08-021-0/+1
* Convert traditional ${MK_TESTS} conditional idiom for including testEnji Cooper2017-08-021-3/+1
* Update the diff3 manpage to reflect the fact the version in freebsd doesBaptiste Daroussin2017-05-251-21/+1
* For now comment tests for arguments which are not in par with GNU diff3 yetBaptiste Daroussin2017-05-251-5/+5
* Remove the MAX_CHECK macro, it was initially used to test if a file was aBaptiste Daroussin2017-05-251-2/+0
* Import working progress BSD diff3Baptiste Daroussin2017-05-2517-0/+1171