sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Recommend file-by-file mode for Jujutsu config 

The previous docs gave difft two directories to diff.  But that
loses information about file renames, which is information jj has.

This configuration tells Jujutsu to pass individual pairs of files
to difft.
pull/864/head
Evan Martin 2025-07-25 11:11:50 +07:00 committed by GitHub
parent 084a72b558
commit c5a7d84c1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manual/src/jj.md
Unescape Escape View File

@ -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"
```