Comment by werdnapk

I used to use Araxis Merge [1] years ago and found it worked very well.

[1] https://www.araxis.com/merge/index.en