The state of Meld on Macs is currently in flux. TLDR: currently, the best
way to run Meld is to install Homebrew and then run
brew install dehesselle-meld.
Update 2025-04-21: Starting today, it seems that Homebrew renamed the
dehesselle-meld cask to just meld, https://formulae.brew.sh/cask/meld.
So, brew install --cask meld should work (possibly after updating
Homebrew), and simple brew install meld might work too.
| [merge] | |
| conflictstyle = diff3 | |
| tool = three_meld | |
| [mergetool "three_meld"] | |
| # Opens up four diff windows: | |
| # LOCAL:MERGED, BASE:LOCAL, BASE:REMOTE, LOCAL:REMOTE | |
| # | |
| # Lets you edit the MERGED file (including original diff3 markers), showing | |
| # you the final diff from LOCAL. For reference, you can look in the other | |
| # windows to see how LOCAL and REMOTE are each different from BASE, as well |
vimdiff comes as a pre-configured merge tool for jj
and can be used with jj resolve out of the box. However, the default configuration for
vimdiff as a diff editor (for jj split, etc.) is barely useable.
To more conveniently use Vim as a difftool for jj, try one of the following setups:
DirDiff Vim plugin.