Meld for Macs
Beyond Compare is a pretty good diff/merge tool that runs natively on macOS. Sure it's UI is slightly non-native too.<p><a href="https://www.scootersoftware.com/" rel="nofollow">https://www.scootersoftware.com/</a>