mergemaster -U ask for a lot non-user modified files

David Demelier demelier.david at
Thu Feb 17 07:17:39 UTC 2011


Each time I run mergemaster -UiF, it asks for a lot of file that I do 
not have modified such as /dev/rc.d/* and /etc/defaults/*


   Use 'd' to delete the temporary ./etc/network.subr
   Use 'i' to install the temporary ./etc/network.subr
   Use 'm' to merge the temporary and installed versions
   Use 'v' to view the diff results again

   Default is to leave the temporary file to deal with by hand

How should I deal with this? [Leave it for later]

I never touched this file! Why it asks me to install the new one?


David Demelier

More information about the freebsd-questions mailing list