From ce0aa951627246d89a560d6cea123e61057bfa7d Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 29 Nov 2022 14:43:57 -0800 Subject: [PATCH] docs: clarify diff editor interface --- docs/config.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/config.md b/docs/config.md index c13280048..896afde96 100644 --- a/docs/config.md +++ b/docs/config.md @@ -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"]