Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
Accelerator
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
Uh oh!
There was an error while loading.
Please reload this page
.
mistweaverco
/
diffconflicts.nvim
Public
Notifications
You must be signed in to change notification settings
Fork
2
Star
9
Code
Issues
0
Pull requests
1
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights
Commits
Breadcrumbs
History for
diffconflicts.nvim
lua
diffconflicts
on
main
User selector
All users
All time
Commit history
Commits on Jul 7, 2026
feat(keybinds): expose api and add keybinds for diffconflicts
gorillamoe
committed
ba7bf69
View commit details
Copy full SHA for ba7bf69
View code at this point
Browse repository at this point
Commits on Apr 25, 2026
fix(history): DiffConflictsWithHistory not working reliably (#5)
gorillamoe
authored
708d359
View commit details
Copy full SHA for 708d359
View code at this point
Browse repository at this point
fix(qol): fix advance to next conflict resolution (#4)
Show description for cb326eb
gorillamoe
authored
cb326eb
View commit details
Copy full SHA for cb326eb
View code at this point
Browse repository at this point
Commits on Apr 8, 2026
feat(dx): add qol improvements to diffconflicts (#2)
Show description for 2267daa
gorillamoe
authored
2267daa
View commit details
Copy full SHA for 2267daa
View code at this point
Browse repository at this point
Commits on Mar 25, 2026
feat(vcs): add jujutsu support
gorillamoe
committed
e5393fc
View commit details
Copy full SHA for e5393fc
View code at this point
Browse repository at this point
Commits on Aug 19, 2025
initial import
gorillamoe
committed
3748a2f
View commit details
Copy full SHA for 3748a2f
View code at this point
Browse repository at this point
Loading
You can’t perform that action at this time.
