whiteinge / diffconflicts
A better Vimdiff Git mergetool
☆410Updated last year
Alternatives and similar repositories for diffconflicts:
Users that are interested in diffconflicts are comparing it to the libraries listed below
- Efficient way of using Vim as a Git mergetool☆297Updated 4 years ago
- Make Vim handle line and column numbers in file names with a minimum of fuss☆320Updated 8 months ago
- A vim extension to fugitive.vim for GitLab support☆270Updated 4 months ago
- Git branch management for Vim☆284Updated 3 years ago
- Range, pattern and substitute preview for Vim☆745Updated 2 months ago
- A very simple plugin that makes hlsearch more useful.☆547Updated last month
- Enhancing in-buffer search experience☆334Updated last year
- A Vim plugin to move function arguments (and other delimited-by-something items) left and right.☆487Updated last month
- Vim plugin to diff two directories☆344Updated last year
- A simple Vimscript test framework☆594Updated 11 months ago
- characterize.vim: Unicode character metadata☆294Updated 4 months ago
- Vim mapping for sorting a range of text☆257Updated 4 years ago
- Make terminal vim and tmux work better together.☆351Updated last year
- Vim plugin for insert mode completion of words in adjacent tmux panes☆517Updated 2 years ago
- Vim plugin that maintains a yank history to cycle between when pasting☆379Updated 3 years ago
- 🖥 Enhanced terminal integration for Vim☆464Updated 2 months ago
- Easy git merge conflict resolution in Vim☆272Updated 4 years ago
- A Vim plugin for indent-level based motion.☆224Updated 10 months ago
- A vim plugin to perform diffs on blocks of code☆478Updated 11 months ago
- Tame the quickfix window.☆639Updated 2 months ago
- Display all accessible marks and their surrounding lines in a collapsible sidebar.☆191Updated 11 months ago
- Handle vim sessions like a pro☆256Updated 9 months ago
- incremental search improved - successor of incsearch.vim☆252Updated last year
- Vim plugin that defines a new text object representing lines of code at the same indent level. Useful for python/vim scripts, etc.☆763Updated last year
- Modern buffer manager for Vim☆324Updated last year
- Speed up Vim by updating folds only when called-for.☆707Updated 3 months ago
- tbone.vim: tmux basics☆406Updated 2 years ago
- A Plugin to show a diff, whenever recovering a buffer☆249Updated 2 years ago
- Easy text exchange operator for Vim☆768Updated last year
- Start a * or # search from a visual block☆186Updated last year