Skip to content

Commit e6fc867

Browse files
authored
Merge pull request #848 from asibahi/master
Update jj.md
2 parents b14cc7c + 0a24f13 commit e6fc867

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

manual/src/jj.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Jujutsu
22

33
Jujutsu supports [external diff
4-
commands](https://jj-vcs.github.io/jj/v0.26.0/config/#generating-diffs-by-external-command).
4+
commands](https://jj-vcs.github.io/jj/latest/config/#generating-diffs-by-external-command).
55

66
To use difftastic for diffing in jujutsu, add the following to your
77
[user configuration
8-
file](https://jj-vcs.github.io/jj/v0.26.0/config/#user-config-file).
8+
file](https://jj-vcs.github.io/jj/latest/config/#user-config-files).
99

1010
```toml
1111
[ui]
12-
diff.tool = ["difft", "--color=always", "$left", "$right"]
12+
diff-formatter = ["difft", "--color=always", "$left", "$right"]
1313
```
1414

1515

manual/src/usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Usage
22

33
This page describes how to use the `difft` binary directly. See also
4-
the [Git](./git.html), [Mercurial](./mercurial.html) and
5-
[Fossil](./fossil.html) pages for instructions on how to configure
4+
the [Git](./git.html), [Mercurial](./mercurial.html),
5+
[Fossil](./fossil.html), or [Jujutsu](./jj.html) pages for instructions on how to configure
66
them to use difftastic.
77

88
## File Arguments

0 commit comments

Comments
 (0)