index
:
src
cvs/HEAD
kms/intel
kms/radeon
master
OpenBSD base system
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
usr.bin
/
rcs
/
rcsmerge.c
Age
Commit message (
Expand
)
Author
2006-03-14
add an argument to cvs_diff3() to be able to handle verbosity of
Xavier Santolaria
2006-03-08
fix usage();
Xavier Santolaria
2006-03-08
respect -q; pointed out by Ray Lai.
Xavier Santolaria
2006-03-07
-z support for RCS;
Joris Vink
2006-03-06
move compat flags into a STANDARDS section;
Jason McIntyre
2006-03-06
adapt informative message if we are sending output to stdout.
Xavier Santolaria
2006-03-06
if the submitted rev(s) is/are the same as the head rev, skip the process
Xavier Santolaria
2006-01-05
cleanup, 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-10
switch to xmalloc stuff, me and xsa@ agreed on this a long
Joris Vink
2005-11-28
sync usage() for `-xsuffixes';
Xavier Santolaria
2005-11-21
enable `-xsuffixes' support as it has been added a few days ago
Xavier Santolaria
2005-11-02
print RCS file path;
Xavier Santolaria
2005-11-02
sync with Reality;
Xavier Santolaria
2005-10-26
diff3_conflicts cleanup; joris ok
Xavier Santolaria
2005-10-23
add extern int diff3_conflicts to unbreak. bad joris.
Niall O'Higgins
2005-10-23
correct error message;
Xavier Santolaria
2005-10-23
warn if conflicts were found during the merge;
Joris Vink
2005-10-23
with recent diff3 support, rcsmerge now works;
Joris Vink
2005-10-18
skeletons for rcsmerge(1);
Xavier Santolaria