summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff3.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* add very basic support for the following stuff:joris2005-12-031-3/+15
| | | | | | | | | | | | | | | | | | | | | - checkout in local mode (example: /cvs) - update in local and server mode (example: /cvs and user@host:/cvs) - import in local and server mode (example: /cvs and user@host:/cvs) what remains to be done: - not all options are supported yet, and update cannot pick up newly added files yet. these things are pending and will be commited real soon. - checkout only works locally right now. - fix rcs parsing code so that we don't fucking hog 100% cpu on really BIG BIG BIG ass trees. mainly tested by pedro@ and myself, thanks a lot pedro! "go for it" niallo@
* missing casts;xsa2005-11-081-6/+6
|
* diff3_conflicts cleanup; joris okxsa2005-10-261-3/+3
|
* better output;joris2005-10-231-6/+10
|
* shut up gcc;joris2005-10-231-3/+3
|
* - correctly terminate buffer in edscript(), noted by pedro@joris2005-10-231-10/+18
| | | | - fix patching for large files;
* diff3 support, needed for merging files together;joris2005-10-221-0/+808
"go for it" niallo@