On 1/9/11, Andrej Mitrovic <andrej.mitrov...@gmail.com> wrote: > I'm keeping my eye on BeyondCompare. But it's not free. It's $80 for > the dual platform Linux+Windows and the Pro version which features > 3-way merge. It's customization options are great though. There's a > trial version over at http://www.scootersoftware.com/ if you want to > give it a spin. >
There's at least one caveat though: it doesn't natively support D files. So the best thing to do is add *.d and *.di as file masks for its C++ parser.
