A better Vimdiff Git mergetool
☆422Jan 30, 2024Updated 2 years ago
Alternatives and similar repositories for diffconflicts
Users that are interested in diffconflicts are comparing it to the libraries listed below. We may earn a commission when you buy through links labeled 'Ad' on this page.
Sorting:
- Efficient way of using Vim as a Git mergetool☆306Sep 7, 2020Updated 5 years ago
- Easy git merge conflict resolution in Vim☆275Apr 19, 2025Updated last year
- Weapon to fight against conflicts in Vim.☆544May 20, 2024Updated 2 years ago
- Vim and Neovim plugin to reveal the commit messages under the cursor☆1,373May 30, 2025Updated last year
- Better Diff options for Vim☆362Sep 20, 2024Updated last year
- Virtual machines for every use case on DigitalOcean • AdGet dependable uptime with 99.99% SLA, simple security tools, and predictable monthly pricing with DigitalOcean's virtual machines, called Droplets.
- Helps you win at grep.☆1,248Feb 18, 2025Updated last year
- Range, pattern and substitute preview for Vim☆751Jan 25, 2025Updated last year
- Change code right in the quickfix window☆362Feb 2, 2022Updated 4 years ago
- A vim plugin to yank code.☆34Jul 23, 2025Updated 10 months ago
- Ease your git workflow within Vim☆1,331May 29, 2024Updated 2 years ago
- A Vim plugin to move function arguments (and other delimited-by-something items) left and right.☆489Jul 28, 2025Updated 10 months ago
- Modern performant fuzzy picker, tree-sitter highlighting, and more, for both Vim and NeoVim☆2,139Apr 6, 2026Updated 2 months ago
- Vim plugin that provides additional text objects☆2,637Jul 10, 2024Updated last year
- Directory viewer for Vim netrW => netrL☆1,267Jun 2, 2026Updated last week
- Deploy on Railway without the complexity - Free Credits Offer • AdConnect your repo and Railway handles the rest with instant previews. Quickly provision container image services, databases, and storage volumes.
- vim match-up: even better % navigate and highlight matching words modern matchit and matchparen. Supports both vim and neovim + tree-s…☆1,910May 19, 2026Updated 3 weeks ago
- the missing window movement☆96Oct 5, 2019Updated 6 years ago
- A blazingly fast, stunningly beautiful, exceptionally powerful git branch viewer for Vim/Neovim.☆904Mar 19, 2025Updated last year
- " / @ / CTRL-R☆1,182Aug 19, 2025Updated 9 months ago
- A Neo/vim plugin to create modes.☆30May 15, 2020Updated 6 years ago
- Viewer & Finder for LSP symbols and tags☆1,932Dec 11, 2024Updated last year
- Enhancing in-buffer search experience☆329Sep 6, 2023Updated 2 years ago
- A git commit browser in Vim☆1,402May 19, 2026Updated 3 weeks ago
- Support for SVN, Git, HG and BZR☆47Nov 16, 2022Updated 3 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- Switch between single-line and multiline forms of code☆1,972May 24, 2026Updated 2 weeks ago
- A textobject plugin to do well with each delimited part of a string.☆51Sep 5, 2017Updated 8 years ago
- Move 'up' or 'down' without changing the cursor column. Cursor *always* stays in the same column.☆92Feb 13, 2015Updated 11 years ago
- A simple Vim plugin to switch segments of text with predefined replacements☆761Feb 25, 2026Updated 3 months ago
- The missing motion for Vim☆3,514Dec 10, 2025Updated 6 months ago
- Tame the quickfix window.☆678May 18, 2025Updated last year
- killring-alike plugin for neovim and vim 8 with no default mappings☆239Nov 6, 2023Updated 2 years ago
- Make the yanked region apparent!☆879Dec 31, 2024Updated last year
- 🐀 Enhanced multi-file search for Vim☆693May 25, 2026Updated 2 weeks ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- Make Vim handle line and column numbers in file names with a minimum of fuss☆335Feb 14, 2026Updated 3 months ago
- A plugin for Vim to color different parts of code making the use of Text Properties☆105Jan 10, 2022Updated 4 years ago
- Set of operators and textobjects to search/select/edit sandwiched texts.☆1,531Mar 20, 2024Updated 2 years ago
- A Vim plugin for managing three-way merges.☆234May 4, 2022Updated 4 years ago
- Find And Replace Vim plugin☆905May 14, 2024Updated 2 years ago
- Like VSCode-Jest, but for Vim☆51Jan 4, 2023Updated 3 years ago
- Show a diff using Vim its sign column.☆2,725Mar 12, 2026Updated 2 months ago