summaryrefslogtreecommitdiff
path: root/usr.bin/diff3
AgeCommit message (Collapse)Author
2003-07-31Fix botched conversion to getopts; markus@Todd C. Miller
2003-07-22Install diff3.ksh with the correct name; noticed by TheoTodd C. Miller
2003-07-14knfTheo de Raadt
2003-07-10A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitTodd C. Miller
(KNF and -Wall) and rewrote the shell front-end.