luladjiev·7 years ago·discussAnother suggestion is Beyond Compare, the 3 way merge is a pro feature though:https://www.scootersoftware.com/