File compare/merge

[Jesse Phillips]

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 use fugitive for Vim.
https://github.com/tpope/vim-fugitive

But I haven't learned much of it and probably could benefit from 
meld (I've never used).