balkian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj: use meld for conflict resolution

Browse Source
This commit is contained in:
J. Fernando Sánchez
2026-06-10 23:06:27 +02:00
parent bdf93421b1
commit e90cbb4947
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jj/.config/jj/config.toml
View File

@@ -18,13 +18,14 @@ f = ["git", "fetch"]
p = ["git", "push"] p = ["git", "push"]
[ui] [ui]
pager = "delta" #":builtin" pager = "delta"
diff-formatter=":git" diff-formatter = "delta"
paginate = "auto" paginate = "auto"
default-command = ["log", "--reversed"] default-command = ["log", "--reversed"]
merge-editor = "meld"
[merge-tools.delta] [merge-tools.delta]
diff-args=["--color-only", "--side-by-side", "$left", "$right", "--width=$width"] diff-args = ["--side-by-side", "$left", "$right", "--width=$width"]
[revset-aliases] [revset-aliases]
'private_commits()' = "description('[local]')" 'private_commits()' = "description('[local]')"