summaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.ksh
AgeCommit message (Expand)Author
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