etc/conf.d/
.bashrc merged
etc/psad/psad.conf deleted; menuconfig.config updated
smb.conf
etc/postfix/main.cf
delete config file
configue file edited
test
delete again
/home/kk/.bashrc
echo a > testfile
echo b > testfile
test merge function
deleted:    testfile
etc/rsyslog.conf added, to change rsyslog time format.
to enable xiaomi adb
merge from t510]