diffchar.vim
vim-mergetool
diffchar.vim | vim-mergetool | |
---|---|---|
4 | 6 | |
206 | 281 | |
- | - | |
4.1 | 0.0 | |
3 months ago | over 3 years ago | |
Vim Script | Vim Script | |
MIT License | MIT License |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
diffchar.vim
-
Git Single letter substitutions
If you need character or word based diffs, the diffchar plugin adds support for them to vimdiff.
-
Text formatting or not formatting
I've tried mitigating the issue with diffchar, but even this plugin struggles when words are moved to new lines and spaces are added. I found a couple of old discussions in the sub but they didn't go very far. I've even tried wrapping (ah! see what I did here?) my head around the concept of semantic linefeeds, but it seems to go against formatting altogether.
- Any plugins or something for text editing?
-
<plug> mappings don't work, even though the mapping seems succesful and calling the mapped function DOES work. What's happening?
I've just installed diffchar.vim for some better diff movement.
vim-mergetool
-
Any plugin to achieve this dual buffer view for diffs?
I'm using diffview.nvim and https://github.com/samoshkin/vim-mergetool for merge conflicts resolving.
-
What git plugin is being used?
For resolving merge conflicts: samoshkin/vim-mergetool
-
what are the must have git plugs? in your opinion
I haven't seen https://github.com/samoshkin/vim-mergetool mentioned. I'm more and more gravitating towards 2-way diff viewing, also using diffview.nvim. also wrote https://github.com/emmanueltouzery/agitator.nvim with a few helpful functions for my use. And then others that have been mentioned, neogit, gitsigns.
-
Is there a better way to see git diff in vim?
You should also try vim-mergetool .
- Please finally tell me how do you resolve conflicts in (neo)vim?
- Using neovim as a git diff tool
What are some alternatives?
linediff.vim - A vim plugin to perform diffs on blocks of code
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
spotdiff.vim - A range and area selectable diffthis to compare partially
lazygit - simple terminal UI for git commands
patchreview-vim - Vim/Neovim plugin for doing single, multi-patch or diff code reviews
diffconflicts - A better Vimdiff Git mergetool
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
vim-conflicted - Easy git merge conflict resolution in Vim