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

2
nvim/.config/nvim/lazy-lock.json
View file

@ -29,7 +29,7 @@
"hunk.nvim": { "branch": "master", "commit": "1e0a4d719c780bb8b0690a54915601508ced321e" }, "hunk.nvim": { "branch": "master", "commit": "1e0a4d719c780bb8b0690a54915601508ced321e" },
"image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" }, "image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" },
"img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" },
"jj-diffconflicts": { "branch": "feat/remove-instruction-message", "commit": "ee3f9179b2ab94d5177d3935fbf2bc94258d3541" }, "jj-diffconflicts": { "branch": "main", "commit": "82b4a871b43c447213243e53b6d8b3c6d5729f6e" },
"jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" }, "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
"lazy-events.nvim": { "branch": "main", "commit": "63802b7ddc852bdfa29e33b158d52429276fa742" }, "lazy-events.nvim": { "branch": "main", "commit": "63802b7ddc852bdfa29e33b158d52429276fa742" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },

8
nvim/.config/nvim/lua/plugins/git.lua
View file

@ -119,5 +119,11 @@ return {
}, },
}, },
}, },
{ "rafikdraoui/jj-diffconflicts", lazy = false }, {
"rafikdraoui/jj-diffconflicts",
config = function()
vim.g.jj_diffconflicts_show_usage_message = false
end,
cmd = {"JJDiffConflicts"},
},
} }

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

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