Commit graph

2 commits

Author SHA1 Message Date
Ching Pei Yang
0c4dc0f100 git/git-conflict: avoid shadowing builtin keybinds 2025-02-21 14:19:05 +01:00
Ben Mayer
a86df770c1
plugins/git: add git-conflict-nvim (#637)
* plugins/git: add git-conflict-nvim; modularize

* plugins/git: build git-conflict-nvim ourselves
2025-02-14 11:57:21 +00:00