diff options
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"] |