The Fugue

OS X has this nifty utility called FileMerge which is far and away the best way to merge differing files that I have ever seen. Yes, that includes vimdiff, although a sufficiently large gvimdiff is pretty good too. If you give it a try, don't give up saying "too much mousing" until you've explored the (mostly hidden) keyboard acceleration. I found sensible accelerators for every function I hoped for.

Bruno De Fraine has gifted us with a set of bash scripts to use FileMerge as Subversion's --diff-cmd and --diff3-cmd. This means when you have a conflict in Subversion you can merge with FileMerge. Along with the [helpers] section in ~/.subversion/config you can be in FileMerge/SVN paradise.

I intend to figure out how to get this working with darcs soon. Actually I've found some pages about it that don't seem to work with my current version of darcs. When I get more HDD space I can install that silly Haskell compiler and upgrade, then I will report if it works.