I'm happy to see some innovation in diff and merge tools. I have been happy to pay for Beyond Compare. The diff and especially merge is so much better than the

I'm happy to see some innovation in diff and merge tools. I have been happy to pay for Beyond Compare. The diff and especially merge is so much better than the built-in tools. I absolutely hate doing a complex merge on the command line, or trying to edit the conflict files git spits out manually. But, Beyond Compare doesn't really integrate with git. You can set it to open for 'git difftool' and 'git mergetool' of course, but that's it. BC isn't well integrated with the Linux desktop either, not even the clipboard. Has anyone here tried both Beyond Compare and Sublime Merge or an other new tool? What keeps me using BC, despite its flaws, is the core diff and merge algorithms. It just does a better job of showing what actually changed, and lets me manually align code when necessary. The suggested merges are very often right too.