On Thu, Oct 12, 2006 at 09:17:04PM -0700, Craig B. wrote:
} > Are you planning on using WinMerge via Parallels? It’s pretty
} > that way. I love it better than any current merge tool for Mac, so
} > keep a networked Win XP PC next to my mac to do the merging with
} > WinMerge. I am also about 1/2 way done with a Cocoa replacement for
} > WinMerge that mimics its layout and methodology. If you have found
} > better way to run WinMerge on a Mac besides Parallels, then PLEASE
} Have you looked at FileMerge from the Apple Developer Tools?
The best file merging tool I have ever used is actually gvim -d (a.k.a.
gvimdiff). It lets me edit two files, side-by-side, with a live
syntax-colored diff in my favorite editor. I can move text from one side
the other trivially, and see character-by-character differences (e.g.
that are almost the same except for a word or two will show exactly
in the line they differ). Even better, it’s available on all major
platforms (*nix, Mac, Windows), so I don’t have to give it up or run
another OS in emulation if I’m on a platform I don’t usually use.
} Craig B.