summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
AgeCommit message (Expand)Author
2006-01-05cleanup, move log.h and rcs.h inclusion into rcsprog.h;Xavier Santolaria
2006-01-02#include's cleanup; ok joris@ niallo@.Xavier Santolaria
2005-12-10switch to xmalloc stuff, me and xsa@ agreed on this a longJoris Vink
2005-11-28sync usage() for `-xsuffixes';Xavier Santolaria
2005-11-21enable `-xsuffixes' support as it has been added a few days agoXavier Santolaria
2005-11-02print RCS file path;Xavier Santolaria
2005-11-02sync with Reality;Xavier Santolaria
2005-10-26diff3_conflicts cleanup; joris okXavier 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-23with recent diff3 support, rcsmerge now works;Joris Vink
2005-10-18skeletons for rcsmerge(1);Xavier Santolaria