ilyagr.bsky.social
just playing with tangled
cli: warn on startup for vimdiff used as a diff editor
This is more visible than a comment. Once this is supported, I'm
considering removing this entirely. I doubt many people intentionally
use it, but if so, they can easily remove this warning in their config.
Another option would be to set up a file-by-file diff editing mode,
for which vimdiff would be fine.
+9
-7
+9
-7
cli/src/config/merge_tools.toml
+9
-7
cli/src/config/merge_tools.toml
···
1
1
[merge-tools.diffedit3]
2
-
program="diffedit3"
2
+
program = "diffedit3"
3
3
# 17376 is a verified random number, as in https://xkcd.com/221/ :). I am trying
4
4
# to avoid 8000 or 8080 in case those, more commonly used, port numbers are used
5
5
# for something else.
···
9
9
edit-args = ["$left", "$right", "$output", "--port", "17376-17380", "--port", "0"]
10
10
11
11
[merge-tools.diffedit3-ssh]
12
-
program="diffedit3"
12
+
program = "diffedit3"
13
13
# 17376 is a verified random number, as in https://xkcd.com/221/ :). I am trying
14
14
# to avoid 8000 or 8080 in case those, more commonly used, port numbers are used
15
15
# for something else.
···
31
31
merge-args = ["$left", "$base", "$right", "-o", "$output", "--auto-merge"]
32
32
33
33
[merge-tools.meld-3]
34
-
program="meld"
34
+
program = "meld"
35
35
# If using this as a template, note that `$output` is repeated twice below
36
36
edit-args = ["$left", "$output", "$right", "-o", "$output"]
37
37
···
55
55
"-c", "wincmd J", "-c", "set modifiable", "-c", "set write",
56
56
"-c", "/<<<<<</+2"]
57
57
merge-tool-edits-conflict-markers = true
58
-
# Using vimdiff as a diff editor is not recommended. For instructions on configuring
59
-
# the DirDiff Vim plugin for a better experience, see
60
-
# https://gist.github.com/ilyagr/5d6339fb7dac5e7ab06fe1561ec62d45
61
-
edit-args = ["-f", "-d", "$left", "$right"]
58
+
# Directory diffing is barely usable in vimdiff without additional plugins
59
+
edit-args = [
60
+
"-f", "-d", "$left", "$right", "-c", "echohl WarningMsg", "-c",
61
+
'echomsg "Warning: using plain `vimdiff` as a diff editor is not recommended. See https://github.com/jj-vcs/jj/wiki/Vim for alternatives."',
62
+
"-c", "echohl None",
63
+
]
62
64
63
65
# if you change the settings for vscode, please do the same for vscodium
64
66
[merge-tools.vscode]