File compare/merge

[Brad Anderson]

On Monday, 1 April 2013 at 19:53:23 UTC, 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?

I just use WinMerge when necessary but I mostly use `git diff` 
day to day.