master
Install diff3.ksh with the correct name; noticed by Theo
convert to new .Dd format;
Add where missing and harmonize PATH to be _PATH_DEFPATH (without local nor X11R6). Suggested by tb@
Fix merging of files that lack a final \n at EOF after a block of common lines.