I recently saw the new feature about merging stored procedures in conflicts.
I can see only 2 products supported:
- KDiff3 (Old and with a KDE style UI)
- Beyond Compare 3 (Nice UI but not free)
What about supporting WinMerge?
It's Open Source and with a much better UI.