About
Resources
Blog
Docs
Source
Status
Social
Discord
IRC
Bluesky
X/Twitter
Contact
team@tangled.org
security@tangled.org
Legal
Terms of Service
Privacy Policy
Sign in
Join now
mediate.nvim
hensel.dev
/
Star
Starred
Star
0
Something went wrong. Try again.
Fork
0
Eye filled
Watch
Watching
Watch
A very simple Neovim plugin to help you with manual Git conflict resolution.
Star
Starred
Star
0
Something went wrong. Try again.
Fork
0
Eye filled
Watch
Watching
Watch
Overview
Overview
Issues
Issues
Pulls
Pulls
Pipelines
Pipelines
mediate.nvim
/
tests
2 files
at
main
hensel.dev
·
test: Add a bit more testing and move elsewhere
·
1y ago
0a87d014
conflict_detection_spec.lua
test: Add a bit more testing and move elsewhere
1y ago
minimal.vim
Initial commit
3y ago