File compare/merge

[Nick Sabalausky]

On Mon, 01 Apr 2013 12:53:23 -0700
Walter Bright <newshound2 at digitalmars.com> wrote:

> Life has gotten a lot easier for me trying to manage multiple
> branches of D since I've been using file compare/merge tools.
> 
> I use winmerge for Windows, and meld for Linux. They are both free,
> and work great.
> 
> What do you use?

I've been using Beyond Compare <http://www.scootersoftware.com/> for
over ten years now. Can't live without it, and wouldn't want to
anyway ;) Heck, I use it a lot even for non-development purposes.