*nix

• EmacsEditor (of course!) - the built-in patch support makes patch mergeing a breeze
• VimEditor (of course!) - not just a vi clone, vim is a very powerful multi-window editor
• PerlUnit (known as TestUnit, available from CPAN) for perl unit tests

Mac

Windows

• WinCvsGettingStarted - cvs in all its complex glory, on windows

• http://www.tortoisecvs.org/ - integrates with Windows Explorer right-click menu, not as comprehensive as WinCVS but has everything most people need. Try this one first and only go to WinCVS if you need more.

• http://cvsgrab.sourceforge.net/ - for when your firewall blocks access to the pserver cvs protocol.

• http://winmerge.sourceforge.net/ - graphical tool for compareing and merging different files and directories (e.g. your deployed twiki server and your local twiki-cvs copy). If you haven't upgraded to v2.x yet, do so; The usability score went way up.

-- CrawfordCurrie - 28 Oct 2003