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

Merge pull request #848 from asibahi/master 

Update jj.md
pull/603/merge
Wilfred Hughes 2025-06-20 23:25:24 +07:00 committed by GitHub
parent b14cc7c96f 0a24f131a1
commit e6fc867755
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
# Jujutsu # Jujutsu
Jujutsu supports [external diff Jujutsu supports [external diff
commands](https://jj-vcs.github.io/jj/v0.26.0/config/#generating-diffs-by-external-command). commands](https://jj-vcs.github.io/jj/latest/config/#generating-diffs-by-external-command).
To use difftastic for diffing in jujutsu, add the following to your To use difftastic for diffing in jujutsu, add the following to your
[user configuration [user configuration
file](https://jj-vcs.github.io/jj/v0.26.0/config/#user-config-file). file](https://jj-vcs.github.io/jj/latest/config/#user-config-files).
```toml ```toml
[ui] [ui]
diff.tool = ["difft", "--color=always", "$left", "$right"] diff-formatter = ["difft", "--color=always", "$left", "$right"]
``` ```

4
manual/src/usage.md
Unescape Escape View File

@ -1,8 +1,8 @@
# Usage # Usage
This page describes how to use the `difft` binary directly. See also This page describes how to use the `difft` binary directly. See also
the [Git](./git.html), [Mercurial](./mercurial.html) and the [Git](./git.html), [Mercurial](./mercurial.html),
[Fossil](./fossil.html) pages for instructions on how to configure [Fossil](./fossil.html), or [Jujutsu](./jj.html) pages for instructions on how to configure
them to use difftastic. them to use difftastic.
## File Arguments ## File Arguments