Meld is a visual diff and merge tool. It integrates with most version control systems. The diff viewer lets you edit files in place (diffs update dynamically), and a middle column shows detailed changes and allows merges. The margins show location of changes for easy browsing, and it also features a tabbed interface that allows you to open many diffs at once.
Excellent program for large libs.
Especially good for quick browsing through gtk+/gnome headers.
Re: Nice Java/C++ Style commenting
> /* //
> ... code ...
> // */
Even nicer than this, is when you want to toggle
between two sections of code thus:
You can choose between code 1 and 2 by
removing the very first /
Most colorizing editors get this right, whereas
they wouldn't get #if 0/#if 1