summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff.h
AgeCommit message (Expand)Author
2010-07-28Support -U and -C to specify the context length for "cvs diff".Nicholas Marriott
2010-07-23Reduce variable/function name and whitespace differences betweenRay Lai
2009-06-07More cvs/diff/rcs convergence:Ray Lai
2009-06-06Sync some rcsdiff changes to cvsdiff. As a side effect,Ray Lai
2009-04-28support some additional diff options: -a, -b, -d, -wStuart Henderson
2008-03-08add checkout/update -j support.Joris Vink
2008-02-27prevent file racesJoris Vink
2008-02-03Added rdiff support. In order to do this, some output and option fixesTobias Stoeckmann
2007-01-28add merging support in both local and remote sides.Joris Vink
2006-06-14add cvs_buf_load_fd() which does the same as cvs_buf_load()Joris Vink
2006-05-31support -p flag for diff, makes dlg@ feel all warmJoris Vink
2006-05-27commit the new opencvs code, i have been hacking onJoris Vink
2006-04-14- don't append the extension if it's already there (PR 5076).Joris Vink
2006-04-10sync comments with reality.Xavier Santolaria
2006-03-14add an argument to cvs_diff3() to be able to handle verbosity ofXavier Santolaria
2005-11-21- print some more informative messagesXavier Santolaria
2005-10-26diff3_conflicts cleanup; joris okXavier Santolaria
2005-10-22fix warning when compiling usr.bin/rcsJoris Vink
2005-10-22diff3 support, needed for merging files together;Joris Vink
2005-10-11export diff_file variable so it can be set from without diff functions;Joris Vink
2005-10-07basic `ci' support is here! more coming soon.Niall O'Higgins
2005-10-05- add a diff.h header file, corresponding to public functions in diff.cNiall O'Higgins