File compare/merge

[Martin Nowak]

On 04/01/2013 09:53 PM, Walter Bright 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?

Diffuse because it supports aligning the diffs.
http://diffuse.sourceforge.net/manual.html#file-comparison-alignment
It also understands git revisions, e.g. "diffuse -r HEAD~100 src/mars.c".
What's missing is folder comparison.