Volker Armin Hemmann <volkerar...@googlemail.com> writes: > well, cfg-update keeps a backup. It detects manual edits and try to > resolve conflicts resulting from that automatically. Which works > surprisingly well. If
Volker gave me that same advice long ago, I've used cfg-update ever since. Its capable of dispatching meaningless file updates in the blink of an eye, and offers several well known methods for resolving those that need it. I personally use vimdiff with it, but there are several other options. Its just a good solid tool.