aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/tests/Makefile
Commit message (Expand)AuthorAgeFilesLines
* diff3: fix merge modeBaptiste Daroussin10 days1-1/+15
* Remove residual blank line at start of MakefileWarner Losh2024-07-151-1/+0
* diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3Baptiste Daroussin2023-09-061-0/+2
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-161-1/+0
* diff3: Add support for -mTom Jones2022-04-191-1/+2
* diff3: Add support for -ATom Jones2022-04-191-1/+2
* diff3: allow diff3 ed scripts to generate deletionsTom Jones2022-04-151-2/+5
* diff3: document and test -TPiotr Pawel Stefaniak2021-08-251-0/+1
* diff3: implement --strip-trailing-crPiotr Pawel Stefaniak2021-08-231-0/+1
* Import working progress BSD diff3Baptiste Daroussin2017-05-251-0/+21