3 commits

Author	SHA1	Message	Date
alfarel	ae1922f6da	treewide: don't import modules manually ... Reduces maintenance burden.	2025-09-27 00:33:21 +00:00
Ching Pei Yang	5fbc72d697	git/git-conflict: avoid shadowing builtin keybinds (#651) ... * git/git-conflict: avoid shadowing builtin keybinds * docs: update release notes --------- Co-authored-by: raf <me@notashelf.dev>	2025-02-21 13:44:05 +00: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