Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

nvim: Turn off usage message for jj-diffconflicts

Browse source
This commit is contained in:
Marty Oehme 2025-09-05 08:48:45 +02:00
parent 4b65069436
commit bd90df30e4
Signed by: Marty
GPG key ID: 4E535BC19C61886E
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
vcs/jj/config/jj/config.toml
View file

@ -20,7 +20,6 @@ merge-editor = "dc"
program = "nvim"
merge-args = [
"-c", "let g:jj_diffconflicts_marker_length=$marker_length",
"-c", "let g:jj_diffconflicts_turn_off_instructions=1",
"-c", "JJDiffConflicts!", "$output", "$base", "$left", "$right"
]
merge-tool-edits-conflict-markers = true