File compare/merge

[dennis luehring]

Am 01.04.2013 21:53, schrieb Walter Bright:
> 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 used several open source, freeware and commercial tools over the 
years but nothing can beat araxis merge (commercial) in any way - it is 
by far the best diff/merge tool available - good in text, 3-way, xml and 
binary diff/merge, in speed and visual representation of moves etc.