[andromeduck]

There's Meld Merge but IMO Beyond Compare is better but it's also proprietary. Kdiff3 is also an option but the UI isn't great.