aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.1
Commit message (Expand)AuthorAgeFilesLines
* diff3: Add man page description for version and helpTom Jones2022-06-231-2/+9
* diff3: Add support for -mTom Jones2022-04-191-1/+3
* diff3: Add support for -ATom Jones2022-04-191-2/+4
* diff3: document and test -TPiotr Pawel Stefaniak2021-08-251-2/+9
* diff3: implement --strip-trailing-crPiotr Pawel Stefaniak2021-08-231-0/+3
* diff3.1: update manual page to match codePiotr Pawel Stefaniak2021-08-231-6/+27
* Update the diff3 manpage to reflect the fact the version in freebsd doesBaptiste Daroussin2017-05-251-21/+1
* Import working progress BSD diff3Baptiste Daroussin2017-05-251-0/+202