summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3/diff3prog.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu>otto2003-11-091-5/+5
* dont compare int to NULL, millert@ okavsm2003-10-241-3/+3
* knfderaadt2003-07-141-31/+31
* A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitmillert2003-07-101-0/+566