On 2013-04-01 21: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?
On Mac OS X, for git, the git bundle in TextMate and Gitx. For non git
related diffs and merges I use FileMerge and/or Kdiff3. FileMerge is
pretty good but chokes on large files. Kdiff3 has a horrible UI on Mac OS X.
--
/Jacob Carlborg
