[GD-Windows] File/folder merge/diff program

[Brian H. <bri...@py...>]

I'm going nuts looking for a decent file and folder merge utility.
Basically I want something just like File Merge on NextStep/OS X,
however FM on OS X doesn't understand that Mac, Unix and Windows
line-breaks are different, so it's useless when trying to view
differences between files that have been editing on different systems.
I'd rather avoid pre-processing everything into a canonical format (just
one more thing to forget when merging).

I'm trying to use Araxis Merge right now (looking at the evaluation
copy), but so far I'm not that impressed.  The UI feels pretty clunky,
and I don't like the fact that you can't (AFAIK) specify a "merged
output" directory.  Intsead, you're editing either left or right files
directly.  On top of that, the key controls are clunky, and it's just
not very good at seeing diffs.

Brian