zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2026-08-15 18:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lazy load more stuff

Browse Source
This commit is contained in:
zoriya
2025-01-03 18:27:23 +01:00
parent 33e482e675
commit 73939399ad
9 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/lua/plugins/git.lua
+2 -1
View File
@@ -40,7 +40,8 @@ return {
{
"git-conflict.nvim",
lazy = false,
-- load on enter to detect + highlight conflicts
event = { "BufReadPost", "BufWritePost", "BufNewFile" },
keys = {
{ "c<", "<Plug>(git-conflict-our)", desc = "Accept ours (top one)" },
{ "c>", "<Plug>(git-conflict-theirs)", desc = "Accept their (bottom one)" },