CVSROOT: /cvs Module name: src Changes by: ajacou...@cvs.openbsd.org 2015/08/24 05:03:41
Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh
Log message:
Make backup directory of replaced files persistent: /var/sysmerge/backups.
3 rotations so that we have history of modified files.
In batch mode, when a file cannot be handled automatically, remove it from
the checksum file so that the next interactive sysmerge(8) run will ask
to merge the changes.
ok rpe@
