diff options
| author | Magdalena Szweda <hi@roughlynamed.net> | 2026-10-08 20:32:02 +0200 |
|---|---|---|
| committer | Magdalena Szweda <hi@roughlynamed.net> | 2026-10-09 16:07:22 +0200 |
| commit | 22931cf7910abee031c36ead241dd534da83adfc (patch) | |
| tree | d397b615d9bcdef6866520bd738b027b0c6de6ce /jj | |
| parent | 60026553761caa7e6ec0794241c1dc5fc581c778 (diff) | |
jj(diff): Make the custom ediff command the standard diff/merge tool for jj
Diffstat (limited to 'jj')
| -rw-r--r-- | jj/.config/jj/config.toml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml index 406b9b6..47a2e61 100644 --- a/jj/.config/jj/config.toml +++ b/jj/.config/jj/config.toml @@ -19,3 +19,10 @@ 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"] |