luladjiev·7 年前·議論Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:https://www.scootersoftware.com/