pacdiff3 - Three-way merge for dealing with pacnew files

view full story

https://bbs.archlinux.org – I've long been irritated by how painful dealing with my .pacnew files can be. Frequently I make small edits to my configuration files. Then any time a package updates its configuration file, I have to manually merge back changes from the resulting .pacnew file. If the new version is significantly different from the old version I sometimes even have trouble remembering which differences between my local copy and the pacnew were my edits and which were not. This afternoon I decided to do something about it.I've written two fairly small python scripts, pacold-create and pacdiff3. pacdif (HowTos)