Programming wisdom #377

[xirax]

Use a merging tool instead of diff command when you need to bring your code up to date. Such as WinMerge.

(That is, unless you already use an editor that can do it, like emacs -- which I don't)