(don't use -3 or -5 if you're unsure what to do) (-1 to exit) (-3 to auto merge all remaining files) (-5 to auto-merge AND not use 'mv -i'): Showing differences between /etc/conf.d/clock and /etc/conf.d/._cfg0000_clock --- /etc/conf.d/clock 2005-12-27 .000000000 0900 /etc/conf.d/._cfg0000_clock 2006-01-22 .000000000 0900 @@ -2,9 2,10 @@ # Set CLOCK to "UTC" if your system clock is set to UTC (also known as # Greenwich Mean Time).
If your clock is set to the local time, then -# set CLOCK to "local". Note that if you dual boot with Windows, then # you should set it to "local".
* See the CONFIGURATION FILES section of the emerge * man page to learn how to update config files.
These are the packages that would be merged, in order: Calculating dependencies... [ebuild R ] dev-libs/openssl-1.0.1g USE="-bindist*" [ebuild N ] net-dns/bind-9.9.4_p2 USE="berkdb dlz gost ipv6 ldap odbc ssl -caps -doc -filter-aaaa -fixed-rrset -geoip -gssapi -idn -mysql -postgres -python -rpz -rrl -sdb-ldap (-selinux) -static-libs -threads -urandom -xml" !!!
Fresh install and everything is working great so now what? If you like nano you can simple go into Konsole and punch in su than enter your password.
Alternatively the files can be merged manually using a regular editor and tools as diff.