JuxtaCode

Compare and merge code

Only for Mac

Free · In‑App Purchases

Mac

The ultimate Git merge tool for the Mac is here! Compare code with ease. Take the pain out of nasty merge conflicts. Try free for 14 days. Unlock with a single purchase. --- With JuxtaCode's intuitive interface, you can effortlessly compare branches, track a file's history, and resolve merge conflicts without leaving the app. Just open your repository, and get to work: • Browse Commits Open your repository to browse its history as well as your current changes. • Compare Code Changes Select 2 commits or branches to compare them side-by-side. • File History Open a source file in JuxtaCode to see a complete list of all the changes it has gone through, including current edits, even across renames. • Resolve Merge Conflicts When you have a conflict, JuxtaCode shows you which 2 branches caused it and the files that need to be resolved. You can resolve each file by selecting from the 2 conflicting versions, or you can open the file in the powerful built-in merge tool. • 3-Way Merge Tool Weave together code from both sides of the conflict with the intuitive merge tool. Major differences are highlighted in color-coded bands that grow and shrink as you make changes. Word differences are also dynamically highlighted. • Powerful Filtering To help drill down to specific code changes, you can filter your repository's timeline by branch or tag. You can also filter commit diffs to only show the specific files that you're interested in. • Compare & Merge Any Plain Text It's not just about Git. Drag or paste whatever plain text you'd like into JuxtaCode to take advantage of its powerful diff and merge tools. All this and other nice things like: • Snappy native performance, and • Syntax highlighting Try it free for 14 days and unlock the full app with a single purchase. Say goodbye to merge headaches with JuxtaCode, your new go-to Git merge tool for the Mac.

  • This app hasn’t received enough ratings or reviews to display an overview.

- Twin Focus: when enabled, hover over a word in a side-by-side diff to highlight the corresponding word on the other side(s) of the diff. - Improved diffing algorithm: better recognition when two bodies of text mainly differ by their line breaks. For example, if [A] has a long paragraph all on one line and [B] has the same content split over multiple lines to maintain a maximum column width, then both passages will be grouped as "modified ≠" and their newline differences highlighted. - Improved diff UI: extra connecting lines now appear in diff dividers when there are a few scattered word differences that might be hard to spot within a large modified segment. In these cases, they'll help to point out where they are and which lines they match up on. - Added the ability for JuxtaCode to serve as a merge tool for Jujutsu. - Performance improvements when generating large diffs. - Fixes an occasional stack overflow crash when generating diffs. - You can edit a text clipping's title by selecting it in the sidebar and pressing enter. - Fixed a bug that caused scrolling to break when both sides of a diff were identical. - Fixed a bug that caused the file drop-down menu to not fully populate at first when using 'git difftool'. - Navigation toolbar buttons (up and down arrows) now become disabled when there are no segments to navigate in a diff.

The developer, Yori Mihalakopoulos, indicated that the app’s privacy practices may include handling of data as described below. For more information, see the developer’s privacy policy .

  • Data Not Linked to You

    The following data may be collected but it is not linked to your identity:

    • Diagnostics

Privacy practices may vary, for example, based on the features you use or your age. Learn More

The developer indicated that this app supports the following accessibility features. Learn More

  • Supported Features

    • Dark Interface

    • Differentiate Without Color Alone

    • Sufficient Contrast

Seller
  • Yori Mihalakopoulos
Size
  • 35.6 MB
Category
  • Developer Tools
Compatibility
Requires macOS 14.0 or later.
  • Mac
    Requires macOS 14.0 or later.
Languages
  • English
Age Rating
4+
In-App Purchases
Yes
Copyright
  • © 2025 Yori Mihalakopoulos