[arch-general] merging files from pacnew

[Kevin Chadwick]

> If you are not comfortable with vimdiff, you can try meld. It is graphical,
> though.

Diffuse is pretty cool too and kdiff3 for folders. Just to be clear I
wouldn't give a gui program root for the final install though.

--
________________________________________________________

 Why not do something good every day and install BOINC.
________________________________________________________