Introducing a new Git merge tool for macOS. With JuxtaCode you can: - Resolve merge conflicts with the 3-way merge tool - Browse and compare commits and branches - Integrate with Terminal and your favorite dev tools using the command line tool. All with a snappy, native user interface.