I’ve been in the process of manually merging two directories in a subversion repo. The second started out as a “development” copy of the first (without branching, unfortunately). Since there’s quite a few files, I decided that a graphical diff program is a must. I usually use kdiff3 …

more ...