JuxtaCode

Yori Mihalakopoulos · A macOS app for reviewing Git history, comparing code or plain text, and resolving merge conflicts with a three-way editor.

CaskDeveloper ToolsAuto-updatesApple silicon · Intel
From homebrew/cask
30-day installs3#2156 in App
1-year installs73Last 365 days
Latest version1.53 days ago · Oct 13
Download size61MBarm64 / x86_64 · zip
Release cadenceEvery 2 weeks1 release in 30 days
  1. 1.5

    LatestOct 13 · Tue

    OpenNavo editorialAdded to Homebrew Oct 14 04:03

    Adds PDF/PNG comparison export and restoration of document windows, sizes and dividers. Improves highlighting and tooltips; fixes macOS 27 file opening and keyboard handling, git difftool file/base selection, and large-text commit rows.

    JuxtaCode 1.5

    Export to PDF or images Choose File ▸ Export PDF or Image… to save a side-by-side comparison as a paginated or continuous PDF, or as a set of PNG images. Export the whole comparison or just a range of lines, choose light or dark appearance, the highlighting theme, font and paper size, and decide whether to include line numbers and column headers.

    Windows reopen where you left them When you relaunch JuxtaCode, your commit, file history, comparison and merge windows now reopen along with your repositories. Window sizes and divider positions are remembered for each document, and the Commit Inspector remembers which commit messages you expanded. Sessions started from git difftool or git mergetool aren’t restored.

    The coloured bar beside the active section of an editable comparison is now subtler, especially in Light appearance, so it no longer flashes distractingly as you scroll.

    More buttons and menu items now show a help tag when you hover over them.

    Fixed: On macOS 27, opening several files at once from Finder or the Dock could open each file on its own, or ask about file history once per file, instead of comparing them together. Folders opened at the same time are no longer ignored.

    Fixed: git difftool could occasionally leave some changed files out of the file list, and comparisons against a merge base (such as git difftool main...feature) could show the wrong base revision for some files.

    Fixed: On macOS 27, the arrow keys didn’t move through the commit list after clicking a commit, and selecting a conflicted file could leave its keyboard shortcuts and File menu commands unavailable.

    Fixed: Rows in the commit list cut off their text when a larger system text size was set.

    Official sources

  2. 1.4.1

    PatchAug 3 · Mon

    OpenNavo editorialAdded to Homebrew Aug 3 08:21

    Fixed an issue where editing a diff could open the sidebar and animate a row while typing.

    Fix
    Editing a diff no longer forces the sidebar open or animates a row while typing.
  3. 1.4

    Jul 29 · Wed

    OpenNavo editorialAdded to Homebrew Jul 31 01:32

    Edit and save non-git diffs, with faster handling of very large diffs and fixes to inspector scrolling.

    Diffs
    Edit non-git diffs in place and save them as .juxta documents.Save edits back to the original files at any time.Very large diffs are much faster.
    Merge
    juxta merge -a -b can launch a file merge session with the juxta beta.
    Fixes
    Fixed periodic inspector sidebar scroll resets.Various stability improvements.