NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 10:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

plugins/git: add git-conflict-nvim (#637)

Browse source 
* plugins/git: add git-conflict-nvim; modularize

* plugins/git: build git-conflict-nvim ourselves
This commit is contained in:
Ben Mayer 2025-02-14 12:57:21 +01:00 • committed by GitHub
commit a86df770c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 88 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/release-notes/rl-0.8.md
View file

@ -162,3 +162,7 @@
[Mr-Helpful](https://github.com/Mr-Helpful)
- Corrects pin names used for nvim themes
[Libadoxon](https://github.com/Libadoxon)
- Add [git-conflict](https://github.com/akinsho/git-conflict.nvim) plugin for resolving git conflicts