Top "Vimdiff" questions

vimdiff is a vim mode that can show differences between two, three or four files.

Why does git mergetool open 4 windows in vimdiff? (I'd expect 3)

When I met a conflict, I tried to use git-mergetool to solve it. I typed: >git mergetool -t vimdiff …

git vim vimdiff
Forcing vimdiff to wrap lines?

When diffing 2 files in VIM, I prefer the lines to be wrapped. However, vimdiff sets wrap to off by default. …

vim word-wrap vimdiff
Use vimdiff to replace entire file?

I'm using vimdiff for a git merge. Is there a quick way to select 1 file to use, right now i'm …

vim merge git-merge vimdiff
How can I install vimdiff on Windows after installing git bash?

I usually use vimdiff when I want to see diff between two points in git. However, I can't find vimdiff …

git git-bash vimdiff
What's the difference between vimdiff and vimdiff2 in git?

What's the difference between them? My search engine results talk only about vimdiff, yet the command git mergetool offers me …

git vim vimdiff
vimdiff as a merge tool

vimdiff helps in showing the diff of two files graphically and allows us to pick the changes from left to …

merge diff vim vimdiff
how to use vimdiff in VIM command mode?

I want to use :vimdiff file1 file2 to diff these files in VIM command mode , but I got a error …

vim vimdiff
vimdiff between current and previous git version of a file

Is there a way of using vimdiff to compare the current version of a file and the same file n …

git vim vimdiff
How to ‘diff’ two subroutines in the same file in Vim?

Is it possible to diff or even vimdiff two very similar subroutines occurring in the same file? If so, how? …

vim diff vimdiff
git, vimdiff and dirdiff

I'm trying to use vimdiff+dirdiff.vim to diff inside Vim multiple files versionned with Git. For Mercurial, it is …

git vim vimdiff