summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff3.c
AgeCommit message (Expand)Author
2005-12-24remove useless cvs_buf_alloc() failure checks;Joris Vink
2005-12-20cvs_buf_putc() and cvs_buf_write_*() functions cannot fail anymore;Xavier Santolaria
2005-12-10switch to xmalloc stuff, me and xsa@ agreed on this a longJoris Vink
2005-12-03add very basic support for the following stuff:Joris Vink
2005-11-08missing casts;Xavier Santolaria
2005-10-26diff3_conflicts cleanup; joris okXavier Santolaria
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