https://github.com/mistweaverco/diffconflicts.nvim
Make resolving merge conflicts in Neovim a breeze.
https://github.com/mistweaverco/diffconflicts.nvim
git git-merge git-mergetool git-mergetools neovim neovim-plugin
Last synced: 4 months ago
JSON representation
Make resolving merge conflicts in Neovim a breeze.
- Host: GitHub
- URL: https://github.com/mistweaverco/diffconflicts.nvim
- Owner: mistweaverco
- License: mit
- Created: 2025-08-19T08:26:16.000Z (10 months ago)
- Default Branch: main
- Last Pushed: 2025-08-24T11:20:56.000Z (10 months ago)
- Last Synced: 2025-08-24T17:05:44.474Z (10 months ago)
- Topics: git, git-merge, git-mergetool, git-mergetools, neovim, neovim-plugin
- Language: Lua
- Homepage:
- Size: 85 KB
- Stars: 1
- Watchers: 0
- Forks: 0
- Open Issues: 0