Beyond Compare is a diff/merge tool available for Windows, Linux as well as Mac OS. Beyond requires a paid license. Beyond compared is reasonably priced and fair. A license is not tied to a specific platform and is not subscription-based. Considering the time saved resolving merge conflicts makes purchasing a license worth while.