File compare/merge

Lionello Lunesu lionello at lunesu.remove.com
Mon Jun 3 04:49:59 PDT 2013


On 4/2/13 3:53, 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?

Under Windows I use TortoiseMerge, part of TortoiseGit/TortoiseSVN but 
also works standalone.
Under OSX/linux I use git diff --color --word-diff :S

L.


More information about the Digitalmars-d mailing list