File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 11# Jujutsu
22
33Jujutsu 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
66To 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
Original file line number Diff line number Diff line change 11# Usage
22
33This 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
66them to use difftastic.
77
88## File Arguments
You can’t perform that action at this time.
0 commit comments