aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.c
Commit message (Expand)AuthorAgeFilesLines
* MFC r340138 (by oshogbo):Mark Johnston2019-12-061-3/+3
* Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.Mariusz Zaborski2018-06-191-1/+1
* 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-251-0/+787