mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 06:57:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

docs: clarify diff editor interface

Browse source
This commit is contained in:
Benjamin Saunders 2022-11-29 14:43:57 -08:00
parent 0df5f7c5bf
commit ce0aa95162
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/config.md
View file

@ -85,9 +85,9 @@ Obviously, you would only set one line, don't copy them all in!
## Diffing
This setting affects the tool used for editing diffs
(e.g. `jj split`, `jj amend -i`).
The default is `meld`.
This setting affects the tool used for editing diffs (e.g. `jj split`,
`jj amend -i`). The default is `meld`. The left and right directories
to diff are passed as the first and second argument respectively.
For example:
@ -97,7 +97,8 @@ When kdiff3 is set via:
diff-editor = "kdiff3"
further settings are passed on via the following:
Custom arguments can be added, and will be inserted before the paths
to diff:
merge-tools.kdiff3.program = "kdiff3"
merge-tools.kdiff3.edit-args = ["--merge", "--cs", "CreateBakFiles=0"]