summaryrefslogtreecommitdiff
path: root/usr.bin
AgeCommit message (Expand)Author
2005-10-24.Xr rcsmerge(1);Xavier Santolaria
2005-10-23add extern int diff3_conflicts to unbreak. bad joris.Niall O'Higgins
2005-10-23correct error message;Xavier Santolaria
2005-10-23warn if conflicts were found during the merge;Joris Vink
2005-10-23better output;Joris Vink
2005-10-23with recent diff3 support, rcsmerge now works;Joris Vink
2005-10-23shut up gcc;Joris Vink
2005-10-23- correctly terminate buffer in edscript(), noted by pedro@Joris Vink
2005-10-22fix warning when compiling usr.bin/rcsJoris Vink
2005-10-22need util.c for diff3Joris Vink
2005-10-22forgot this in previous commit;Joris Vink
2005-10-22diff3 support, needed for merging files together;Joris Vink
2005-10-22- don't check for admin files when running init;Joris Vink
2005-10-20spelling;Jason McIntyre
2005-10-20defintion -> definition;Jason McIntyre
2005-10-20+YFLAGS=Xavier Santolaria
2005-10-20fix output if -p is specified; joris okXavier Santolaria
2005-10-20fix up the licey entry; from form@Michael Shalayeff
2005-10-19Add -h option to display human-readable numbers.Marc Espie
2005-10-19sync usage();Xavier Santolaria
2005-10-19.Xr rcsmerge(1) + one style nitpick;Xavier Santolaria
2005-10-19- make a bunch of changes to how we handle verbose output. this brings usNiall O'Higgins
2005-10-19add co -p support;Joris Vink
2005-10-18Don't consider the last line of the compilation buffer asKjell Wooding
2005-10-18make fill-paragraph undoableKjell Wooding
2005-10-18more rcsmerge(1) bits;Xavier Santolaria
2005-10-18skeletons for rcsmerge(1);Xavier Santolaria
2005-10-18put -N description in the right place, and fix its description;Jason McIntyre
2005-10-18big sorry to simon dassow, whose diff i inadvertently removed;Jason McIntyre
2005-10-18- `-N' works now; document it.Niall O'Higgins
2005-10-18When attempting to open a filename, walk backwards through minibuffer:Kjell Wooding
2005-10-18- no point in using cvs_printf() in openrcs;Joris Vink
2005-10-18oops, rcs_set_rev() can't operate when str is NULL of course;Joris Vink
2005-10-18use rcs_set_rev() instead of duplicating code all over theJoris Vink
2005-10-18correctly handle locks when commiting something;Joris Vink
2005-10-18plug memleaks in rcs_rev_add() when an error occurs;Joris Vink
2005-10-17- remove a printf which kept in by accident.Niall O'Higgins
2005-10-17KNF;Niall O'Higgins
2005-10-17make undo of word-based capitalization functions workKjell Wooding
2005-10-17Use queue macros instead of directly accessing fields. ok pat@ "put itOtto Moerbeek
2005-10-17Use queue macros instead of directly accessing fields. ok pat@ "put itOtto Moerbeek
2005-10-17Use queue macros instead of directly accessing fields. ok pat@ "put itOtto Moerbeek
2005-10-17add client support for the `watch' and `watchers' commands. ok joris@ xsa@Moritz Jodeit
2005-10-17support -f flag for co;Joris Vink
2005-10-17Fix string handling. LOGIN_NAME_MAX includes the NUL, so don't reserve extraKjell Wooding
2005-10-17more cleanups; ok jakob@Kevin Steves
2005-10-17remove #ifdef LWRES; ok jakob@Kevin Steves
2005-10-17fix memory leaks from 2 sources:Kevin Steves
2005-10-17- document the different types of mixerctl variablesJason McIntyre
2005-10-17-k takes an arg;Jason McIntyre
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 01:23:36 +0000