summaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.1
AgeCommit message (Expand)Author
2006-02-22sort options + sync usage();Jason McIntyre
2005-12-27+.Xr sdiff 1 ,Jason McIntyre
2004-07-07- add shell prompt to command exampleJared Yanovich
2003-10-24- fix rcs Xr; from Jared YanovichJason McIntyre
2003-07-14knfTheo de Raadt
2003-07-10A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitTodd C. Miller