summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff3.c
AgeCommit message (Expand)Author
2005-10-23better output;Joris Vink
2005-10-23shut up gcc;Joris Vink
2005-10-23- correctly terminate buffer in edscript(), noted by pedro@Joris Vink
2005-10-22diff3 support, needed for merging files together;Joris Vink