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
Version history of
lua/mediate/
init.lua
October 2025
test: Refactor for testing and test a bit
hensel.dev
·
1y ago
580ee284
Copied
Failed
Copy SHA
hensel.dev
580ee284
Copied
Failed
Copy SHA
test: Refactor for testing and test a bit
1y ago
feat: Support diff3 style
hensel.dev
·
1y ago
7f5db333
Copied
Failed
Copy SHA
hensel.dev
7f5db333
Copied
Failed
Copy SHA
feat: Support diff3 style
1y ago
style: Drop redundant pre-reset partial reset
hensel.dev
·
1y ago
6772b887
Copied
Failed
Copy SHA
hensel.dev
6772b887
Copied
Failed
Copy SHA
style: Drop redundant pre-reset partial reset
1y ago
style: Format
hensel.dev
·
1y ago
2351c5a6
Copied
Failed
Copy SHA
hensel.dev
2351c5a6
Copied
Failed
Copy SHA
style: Format
1y ago
fix: Delete the named mediation buffers
hensel.dev
·
1y ago
ea3c9566
Copied
Failed
Copy SHA
hensel.dev
ea3c9566
Copied
Failed
Copy SHA
fix: Delete the named mediation buffers
1y ago
February 2023
Reset state explicitly after mediation
hensel.dev
·
3y ago
95f6523a
Copied
Failed
Copy SHA
hensel.dev
95f6523a
Copied
Failed
Copy SHA
Reset state explicitly after mediation
3y ago
Make mediate buffers temporary and named
hensel.dev
·
3y ago
3db83620
Copied
Failed
Copy SHA
hensel.dev
3db83620
Copied
Failed
Copy SHA
Make mediate buffers temporary and named
3y ago
fix: Avoid extra newline in mediate bufs
hensel.dev
·
3y ago
38c5b053
Copied
Failed
Copy SHA
hensel.dev
38c5b053
Copied
Failed
Copy SHA
fix: Avoid extra newline in mediate bufs
3y ago
Add basic logic for finishing resolution
hensel.dev
·
3y ago
9091f582
Copied
Failed
Copy SHA
hensel.dev
9091f582
Copied
Failed
Copy SHA
Add basic logic for finishing resolution
3y ago
Add the basic logic for starting mediation
hensel.dev
·
3y ago
2c0ddc63
Copied
Failed
Copy SHA
hensel.dev
2c0ddc63
Copied
Failed
Copy SHA
Add the basic logic for starting mediation
3y ago
Sanity-check mediation start
hensel.dev
·
3y ago
de939644
Copied
Failed
Copy SHA
hensel.dev
de939644
Copied
Failed
Copy SHA
Sanity-check mediation start
3y ago
Sketch out core functionality
hensel.dev
·
3y ago
b7f50b62
Copied
Failed
Copy SHA
hensel.dev
b7f50b62
Copied
Failed
Copy SHA
Sketch out core functionality
3y ago
Set up basic code structure
hensel.dev
·
3y ago
9b242eec
Copied
Failed
Copy SHA
hensel.dev
9b242eec
Copied
Failed
Copy SHA
Set up basic code structure
3y ago