summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
AgeCommit message (Expand)Author
2008-09-12- make it possible to use a user defined MERGE_CMD instead of sdiffAntoine Jacoutot
2008-07-04Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTPStuart Henderson
2008-07-04some small text improvements; ok ajacoutotJason McIntyre
2008-06-13- add support for ignoring files and directories from comparisonAntoine Jacoutot
2008-06-13- always force full file check on fbtab, login.conf, sysctl.conf andAntoine Jacoutot
2008-06-09- encourage people to use the same source as was used to upgrade systemAntoine Jacoutot
2008-06-01- make it possible to merge files from xetcXX onlyAntoine Jacoutot
2008-05-14- add a non-interactive mode to sysmerge ('-b')Antoine Jacoutot
2008-04-30* add xetcXX.tgz support to sysmerge and handle binary filesAntoine Jacoutot
2008-04-24kill first personTheo de Raadt
2008-04-22Welcome sysmerge(8), a mergemaster-based utility to help you updateAntoine Jacoutot