diff --git a/README.md b/README.md index b595a72..77b3edc 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,39 @@ vim.keymap.set('n', ']x', '(git-conflict-next-conflict)') +
example LazyVim key configuration + +```lua +return { + { + "akinsho/git-conflict.nvim", + event = "BufReadPre", + opts = { + default_mappings = false, + }, + keys = { + { "gco", "(git-conflict-ours)", desc = "Choose Ours" }, + { "gct", "(git-conflict-theirs)", desc = "Choose Theirs" }, + { "gcb", "(git-conflict-both)", desc = "Choose Both" }, + { "gc0", "(git-conflict-none)", desc = "Choose None" }, + { "]x", "(git-conflict-next-conflict)", desc = "Next Conflict" }, + { "[x", "(git-conflict-prev-conflict)", desc = "Previous Conflict" }, + { "gcq", "GitConflictListQf", desc = "Conflicts to Quickfix" }, + }, + }, + { + "folke/which-key.nvim", + opts = { + spec = { + { "gc", group = "conflict" }, + }, + }, + }, +} +``` + +
+ ## API This plugin exposes an API to extract some of the data it collects for other