aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3
Commit message (Expand)AuthorAgeFilesLines
...
* 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