Skip to content

Commit

Permalink
README: 0.18 is now the expected version of jj where diffedit3 will b…
Browse files Browse the repository at this point in the history
…e preconfigured

martinvonz/jj#3492 is not yet merged, and I want
to redesign things slightly beforehand
  • Loading branch information
ilyagr committed May 3, 2024
1 parent 8846f5b commit 00b4867
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ manually configure `jj` to use it.

## Using `diffedit3` with `jj`

For `jj` 0.17+, `diffedit3` should be pre-configured. It should be sufficient to
For `jj` 0.18+, `diffedit3` should be pre-configured. It should be sufficient to
set `ui.diff-editor="diffedit3"` in your [`jj` config] or invoke `jj` commands
with `--tool diffedit3` argument. If the `diffedit3` executable is not in your
PATH, you can also set `merge-tools.diffedit3.program` to the path to the
Expand Down

0 comments on commit 00b4867

Please sign in to comment.