A better Vimdiff Git mergetool
☆424Jan 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☆308Sep 7, 2020Updated 6 years ago
- Easy git merge conflict resolution in Vim☆275Apr 19, 2025Updated last year
- Vim and Neovim plugin to reveal the commit messages under the cursor☆1,369May 30, 2025Updated last year
- Weapon to fight against conflicts in Vim.☆546May 20, 2024Updated 2 years ago
- Helps you win at grep.☆1,247Jul 20, 2026Updated 2 months ago
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- Range, pattern and substitute preview for Vim☆750Jan 25, 2025Updated last year
- Better Diff options for Vim☆361Aug 19, 2026Updated last month
- A vim plugin to yank code.☆34Jul 23, 2025Updated last year
- Change code right in the quickfix window☆368Feb 2, 2022Updated 4 years ago
- Ease your git workflow within Vim☆1,330Jul 30, 2026Updated 2 months ago
- A Vim plugin to move function arguments (and other delimited-by-something items) left and right.☆488Jul 28, 2025Updated last year
- Vim plugin that provides additional text objects☆2,642Jul 10, 2024Updated 2 years ago
- Modern performant fuzzy picker, tree-sitter highlighting, and more, for both Vim and NeoVim☆2,144Apr 6, 2026Updated 6 months ago
- Directory viewer for Vim netrW => netrL☆1,279Jul 5, 2026Updated 3 months ago
- Serverless GPU API endpoints on Runpod - Get Bonus Credits • AdSkip the infrastructure headaches. Auto-scaling, pay-as-you-go, no-ops approach lets you focus on innovating your application.
- the missing window movement☆96Oct 5, 2019Updated 7 years ago
- vim match-up: even better % navigate and highlight matching words modern matchit and matchparen. Supports both vim and neovim + tree-s…☆1,931Sep 5, 2026Updated last month
- " / @ / CTRL-R☆1,186Aug 19, 2025Updated last year
- A blazingly fast, stunningly beautiful, exceptionally powerful git branch viewer for Vim/Neovim.☆908Jul 25, 2026Updated 2 months ago
- Viewer & Finder for LSP symbols and tags☆1,935Dec 11, 2024Updated last year
- A git commit browser in Vim☆1,413May 19, 2026Updated 4 months ago
- Enhancing in-buffer search experience☆330Sep 6, 2023Updated 3 years ago
- A Neo/vim plugin to create modes.☆30May 15, 2020Updated 6 years ago
- Switch between single-line and multiline forms of code☆1,973Oct 1, 2026Updated last week
- 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.
- A simple Vim plugin to switch segments of text with predefined replacements☆763Feb 25, 2026Updated 7 months ago
- The missing motion for Vim☆3,534Dec 10, 2025Updated 10 months ago
- Support for SVN, Git, HG and BZR☆48Oct 2, 2026Updated last week
- Tame the quickfix window.☆681May 18, 2025Updated last year
- A plugin for Vim to color different parts of code making the use of Text Properties☆105Jan 10, 2022Updated 4 years ago
- 🐀 Enhanced multi-file search for Vim☆692May 25, 2026Updated 4 months ago
- killring-alike plugin for neovim and vim 8 with no default mappings☆240Nov 6, 2023Updated 2 years ago
- Set of operators and textobjects to search/select/edit sandwiched texts.☆1,530Mar 20, 2024Updated 2 years ago
- Make the yanked region apparent!☆883Dec 31, 2024Updated last year
- Managed hosting for WordPress and PHP on Cloudways • AdManaged hosting for WordPress, Magento, Laravel, or PHP apps, on multiple cloud providers. Deploy in minutes on Cloudways by DigitalOcean.
- Make Vim handle line and column numbers in file names with a minimum of fuss☆338Feb 14, 2026Updated 7 months ago
- Show a diff using Vim its sign column.☆2,726Updated this week
- Find And Replace Vim plugin☆901May 14, 2024Updated 2 years ago
- abolish.vim: Work with several variants of a word at once☆2,962Aug 7, 2024Updated 2 years ago
- Extended f, F, t and T key mappings for Vim.☆1,161Oct 15, 2022Updated 3 years ago
- Plugin to toggle, display and navigate marks☆1,426Oct 20, 2022Updated 3 years ago
- apathy.vim: Set the 'path' option for miscellaneous file types☆182Nov 22, 2021Updated 4 years ago