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 …

For those of you who use KDE and Konsole, you can easily change the title of the Konsole window with the command:

dcop $KONSOLE_DCOP_SESSION renameSession 'NewSessionName'

this is pretty handy if, like me, you end up having a bunch of screen sessions running in different Konsole windows.