branch: externals/vc-jj commit 4dda85674ad56f2b0ee2559d4cc5a0d88bb9824f Author: Rudi Schlatte <r...@constantly.at> Commit: Rudi Schlatte <r...@noreply.codeberg.org>
Update README with new config syntax for setting git-style diffs --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index b5b26ab0b7..dac2ed4c3c 100644 --- a/README.org +++ b/README.org @@ -19,7 +19,7 @@ configuration, for example via =jj config edit --user= or =jj config edit #+begin_src toml [ui] -diff.format = "git" +ui.diff-formatter = ":git" conflict-marker-style = "git" #+end_src