Comment by luladjiev

5 years ago

Another suggestion is Beyond Compare, the 3 way merge is a pro feature though: