summaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.ksh
AgeCommit message (Expand)Author
2019-09-28Add where missing and harmonize PATH to be _PATH_DEFPATH (without local norAntoine Jacoutot
2019-01-25I am retiring my old email address; replace it with my OpenBSD one.Todd C. Miller
2006-02-22sort options + sync usage();Jason McIntyre
2006-01-28add -- after options, so files with leading - work.Ted Unangst
2003-07-31Fix botched conversion to getopts; markus@Todd C. Miller
2003-07-10A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitTodd C. Miller