diff --git a/manual/src/jj.md b/manual/src/jj.md index 585641cf15..3a49190d3e 100644 --- a/manual/src/jj.md +++ b/manual/src/jj.md @@ -9,7 +9,9 @@ file](https://jj-vcs.github.io/jj/latest/config/#user-config-files). ```toml [ui] -diff-formatter = ["difft", "--color=always", "$left", "$right"] -``` - +diff.tool = "difft" +[merge-tools.difft] +diff-args = ["--color=always", "$left", "$right"] +diff-invocation-mode = "file-by-file" +```