summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3/diff3.ksh (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add where missing and harmonize PATH to be _PATH_DEFPATH (without local norajacoutot2019-09-281-2/+2
| | | | | | | X11R6). Suggested by tb@ ok deraadt@ tb@ millert@
* I am retiring my old email address; replace it with my OpenBSD one.millert2019-01-251-2/+2
|
* sort options + sync usage();jmc2006-02-221-2/+2
|
* add -- after options, so files with leading - work.tedu2006-01-281-4/+4
| | | | pr 4993 from jason.
* Fix botched conversion to getopts; markus@millert2003-07-311-5/+8
|
* A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitmillert2003-07-101-0/+62
(KNF and -Wall) and rewrote the shell front-end.