diff options
| author | Magdalena Szweda <hi@roughlynamed.net> | 2026-10-19 15:06:47 +0200 |
|---|---|---|
| committer | Magdalena Szweda <hi@roughlynamed.net> | 2026-10-20 17:24:27 +0200 |
| commit | 8da12a219edf958bf050e952647393840c83ff16 (patch) | |
| tree | d190c39ca1fe00b12abc9245188729d52c6c1218 /jj | |
| parent | 320cbe43b5eb89a54a6303ce5e09a07d1c00f11d (diff) | |
Jj(split): Remove ediff as the default split/merge tool
Diffstat (limited to 'jj')
| -rw-r--r-- | jj/.config/jj/config.toml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml index 638050d..fc65527 100644 --- a/jj/.config/jj/config.toml +++ b/jj/.config/jj/config.toml @@ -23,10 +23,5 @@ pushall = ["util", "exec", "--", "sh", "-c", ''' [ui] default-command = "log" -diff-editor = "ediff" diff-instructions = false -[merge-tools.ediff] -program = "emacs" -edit-args = ["-l", "/home/hi/.config/jj/ediff-split.el", - "-f", "jj-ediff-split", "$left", "$right"] |